updated shared folder location

Josh Klontz
1 parent 455d1c0b
Showing 4 changed files with 6 additions and 12 deletions
sdk/core/core.cpp
sdk/plugins/cascade.cpp
sdk/plugins/eyes.cpp
sdk/plugins/meta.cpp
@@ -213,11 +213,8 @@ private:
     QString getFileName(const QString &description) const
     {
-        foreach (const QString &folder, QDir(Globals->sdkPath + "/share").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)) {
-            const QString file = Globals->sdkPath + "/share/" + folder + "/models/algorithms/" + description;
-            if (QFileInfo(file).exists()) return file;
-        }
-        return "";
+        const QString file = Globals->sdkPath + "/share/openbr/models/algorithms/" + description;
+        return QFileInfo(file).exists() ? file : QString();
     }
     void init(QString description)
@@ -30,7 +30,7 @@ class CascadeResourceMaker : public ResourceMaker&lt;CascadeClassifier&gt;
 public:
     CascadeResourceMaker(const QString &model)
     {
-        file = Globals->sdkPath + "/share/mm/models/";
+        file = Globals->sdkPath + "/share/openbr/models/";
         if      (model == "Ear")         file += "haarcascades/haarcascade_ear.xml";
         else if (model == "Eye")         file += "haarcascades/eye_tree_eyeglasses.xml";
         else if (model == "FrontalFace") file += "haarcascades/haarcascade_frontalface_alt2.xml";
@@ -68,7 +68,7 @@ public:
         Scalar t1, t2;
         // Open the eye locator model
-        file.setFileName(Globals->sdkPath + "/share/mm/models/EyeLocatorASEF128x128.fel");
+        file.setFileName(Globals->sdkPath + "/share/openbr/models/EyeLocatorASEF128x128.fel");
         bool success = file.open(QFile::ReadOnly); if (!success) qFatal("ASEFEyes::ASEFEyes failed to open %s for reading.", qPrintable(file.fileName()));
         // Check the first line
@@ -362,11 +362,8 @@ class LoadStoreTransform : public MetaTransform
     QString getFileName() const
     {
-        foreach (const QString &folder, QDir(Globals->sdkPath + "/share").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)) {
-            const QString file = Globals->sdkPath + "/share/" + folder + "/models/transforms/" + baseName;
-            if (QFileInfo(file).exists()) return file;
-        }
-        return "";
+        const QString file = Globals->sdkPath + "/share/openbr/models/transforms/" + baseName;
+        return QFileInfo(file).exists() ? file : QString();
     }
     bool tryLoad()