From 5ebf2011b26e217f885b0df962315c74ba26b94e Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Tue, 15 Sep 2015 14:51:57 -0400 Subject: [PATCH] improved support for finding thirdparty LoadStore transforms and distances --- openbr/core/core.cpp | 5 +++-- openbr/plugins/core/loadstore.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openbr/core/core.cpp b/openbr/core/core.cpp index dd18233..3ffc614 100644 --- a/openbr/core/core.cpp +++ b/openbr/core/core.cpp @@ -786,11 +786,12 @@ QSharedPointer br::Distance::fromAlgorithm(const QString &algorith class pathInitializer : public Initializer { Q_OBJECT + void initialize() const { - Globals->modelSearch.append(Globals->sdkPath + "/share/openbr/models/transforms/"); + Globals->modelSearch.append(Globals->sdkPath + "/share/openbr/models/transforms"); + Globals->modelSearch.append(Globals->sdkPath + "/../share/openbr/models/transforms"); } - }; BR_REGISTER(Initializer, pathInitializer) diff --git a/openbr/plugins/core/loadstore.cpp b/openbr/plugins/core/loadstore.cpp index 6c9e639..6e4d55f 100644 --- a/openbr/plugins/core/loadstore.cpp +++ b/openbr/plugins/core/loadstore.cpp @@ -202,7 +202,8 @@ private: QString getFileName() const { foreach (const QString &file, QStringList() << fileName - << Globals->sdkPath + "/share/openbr/models/distances/" + fileName) + << Globals->sdkPath + "/share/openbr/models/distances/" + fileName + << Globals->sdkPath + "/../share/openbr/models/distances/" + fileName) if (QFileInfo(file).exists()) return file; return QString(); -- libgit2 0.21.4