Fixes to enable building with BR_EMBEDDED

Scott Klum
1 parent f17baf81
Showing 7 changed files with 70 additions and 44 deletions
openbr/core/utility.cpp
openbr/core/utility.h
openbr/gui/utility.cpp
openbr/gui/utility.h
openbr/plugins/gallery/db.cpp
openbr/plugins/gallery/empty.cpp
openbr/plugins/gallery/xml.cpp
+#include <openbr/core/qtutils.h>
+#include "utility.h"
+
+QStringList br::getFiles(QDir dir, bool recursive)
+{
+    dir = QDir(dir.canonicalPath());
+
+    QStringList files;
+    foreach (const QString &file, QtUtils::naturalSort(dir.entryList(QDir::Files)))
+        files.append(dir.absoluteFilePath(file));
+
+    if (!recursive) return files;
+
+    foreach (const QString &folder, QtUtils::naturalSort(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))) {
+        QDir subdir(dir);
+        bool success = subdir.cd(folder); if (!success) qFatal("cd failure.");
+        files.append(getFiles(subdir, true));
+    }
+    return files;
+}
+
+QStringList br::getFiles(const QString &regexp)
+{
+    QFileInfo fileInfo(regexp);
+    QDir dir(fileInfo.dir());
+    QRegExp re(fileInfo.fileName());
+    re.setPatternSyntax(QRegExp::Wildcard);
+
+    QStringList files;
+    foreach (const QString &fileName, dir.entryList(QDir::Files))
+        if (re.exactMatch(fileName))
+            files.append(dir.filePath(fileName));
+    return files;
+}
+#ifndef BR_CORE_UTILITY_H
+#define BR_CORE_UTILITY_H
+
+#include <QStringList>
+#include <QDir>
+
+#include <opencv2/core/core.hpp>
+#include <openbr/openbr_export.h>
+
+namespace br
+{
+
+BR_EXPORT QStringList getFiles(QDir dir, bool recursive);
+BR_EXPORT QStringList getFiles(const QString &regexp);
+
+} // namespace br
+
+#endif // BR_CORE_UTILITY_H
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/imgproc/imgproc_c.h>
-#include <openbr/core/qtutils.h>
 #include "utility.h"
  
 using namespace cv;
@@ -46,35 +45,3 @@ QImage br::toQImage(const Mat &amp;mat)
  
     return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy();
 }
-
-QStringList br::getFiles(QDir dir, bool recursive)
-{
-    dir = QDir(dir.canonicalPath());
-
-    QStringList files;
-    foreach (const QString &file, QtUtils::naturalSort(dir.entryList(QDir::Files)))
-        files.append(dir.absoluteFilePath(file));
-
-    if (!recursive) return files;
-
-    foreach (const QString &folder, QtUtils::naturalSort(dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))) {
-        QDir subdir(dir);
-        bool success = subdir.cd(folder); if (!success) qFatal("cd failure.");
-        files.append(getFiles(subdir, true));
-    }
-    return files;
-}
-
-QStringList br::getFiles(const QString &regexp)
-{
-    QFileInfo fileInfo(regexp);
-    QDir dir(fileInfo.dir());
-    QRegExp re(fileInfo.fileName());
-    re.setPatternSyntax(QRegExp::Wildcard);
-
-    QStringList files;
-    foreach (const QString &fileName, dir.entryList(QDir::Files))
-        if (re.exactMatch(fileName))
-            files.append(dir.filePath(fileName));
-    return files;
-}
-#ifndef BR_UTILITY_H
-#define BR_UTILITY_H
+#ifndef BR_GUI_UTILITY_H
+#define BR_GUI_UTILITY_H
  
 #include <QImage>
 #include <QStringList>
@@ -12,9 +12,7 @@ namespace br
 {
  
 BR_EXPORT QImage toQImage(const cv::Mat &mat);
-BR_EXPORT QStringList getFiles(QDir dir, bool recursive);
-BR_EXPORT QStringList getFiles(const QString &regexp);
  
 } // namespace br
  
-#endif // BR_UTILITY_H
+#endif // BR_GUI_UTILITY_H
@@ -14,7 +14,9 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
+#ifndef BR_EMBEDDED
 #include <QtSql>
+#endif // BR_EMBEDDED
  
 #include <openbr/plugins/openbr_internal.h>
 #include <openbr/core/qtutils.h>
@@ -18,7 +18,7 @@
  
 #include <openbr/plugins/openbr_internal.h>
 #include <openbr/core/qtutils.h>
-#include <openbr/gui/utility.h>
+#include <openbr/core/utility.h>
  
 namespace br
 {
@@ -14,7 +14,9 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
  
+#ifndef BR_EMBEDDED
 #include <QtXml>
+#endif // BR_EMBEDDED
  
 #include <openbr/plugins/openbr_internal.h>
 #include <openbr/core/bee.h>
@@ -36,10 +38,12 @@ class xmlGallery : public FileGallery
     BR_PROPERTY(bool, skipMissing, false)
     FileList files;
  
+#ifndef BR_EMBEDDED
     QXmlStreamReader reader;
+    bool signatureActive;
+#endif // BR_EMBEDDED
  
     QString currentSignatureName;
-    bool signatureActive;
  
     ~xmlGallery()
     {
@@ -50,15 +54,17 @@ class xmlGallery : public FileGallery
  
     TemplateList readBlock(bool *done)
     {
+        TemplateList templates;
+
+#ifndef BR_EMBEDDED
+        qint64 count = 0;
+
         if (readOpen())
             reader.setDevice(&f);
  
         if (reader.atEnd())
             f.seek(0);
  
-        TemplateList templates;
-        qint64 count = 0;
-
         while (!reader.atEnd())
         {
             // if an identity is active we try to read presentations
@@ -169,8 +175,9 @@ class xmlGallery : public FileGallery
                 }
             }
         }
-        *done = true;
+#endif // BR_EMBEDDED
  
+        *done = true;
         return templates;
     }