Merge branch 'master' of https://github.com/biometrics/openbr into progressin

Scott Klum
2 parents 21d379d2 fc69f628
Showing 4 changed files with 11 additions and 44 deletions
openbr/gui/utility.cpp
openbr/gui/utility.h
openbr/janus
openbr/plugins/gui.cpp
-#include <QImage>
 #include <limits>
 #include <vector>
 #include <opencv2/imgproc/imgproc.hpp>
+#include "utility.h"
 using namespace cv;
-/**** STATIC ****/
-QImage toQImage(const Mat &mat)
+QImage br::toQImage(const Mat &mat)
 {
     // Convert to 8U depth
     Mat mat8u;
@@ -3,7 +3,13 @@
 #include <QImage>
 #include <opencv2/core/core.hpp>
+#include <openbr/openbr_export.h>
-QImage toQImage(const cv::Mat &mat);
+namespace br
+{
+
+BR_EXPORT QImage toQImage(const cv::Mat &mat);
+
+} // namespace br
 #endif // BR_UTILITY_H
-Subproject commit aa2abb334a3179a04e14b713cd31f133d0c81321
+Subproject commit f8e6e450e554612c3f173740beddf9b8daa84270
@@ -13,6 +13,7 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include "openbr_internal.h"
+#include "openbr/gui/utility.h"
 using namespace cv;
@@ -121,45 +122,6 @@ public slots:
     }
 };
-QImage toQImage(const Mat &mat)
-{
-    // Convert to 8U depth
-    Mat mat8u;
-    if (mat.depth() != CV_8U) {
-        double globalMin = std::numeric_limits<double>::max();
-        double globalMax = -std::numeric_limits<double>::max();
-
-        std::vector<Mat> mv;
-        split(mat, mv);
-        for (size_t i=0; i<mv.size(); i++) {
-            double min, max;
-            minMaxLoc(mv[i], &min, &max);
-            globalMin = std::min(globalMin, min);
-            globalMax = std::max(globalMax, max);
-        }
-        assert(globalMax >= globalMin);
-
-        double range = globalMax - globalMin;
-        if (range != 0) {
-            double scale = 255 / range;
-            convertScaleAbs(mat, mat8u, scale, -(globalMin * scale));
-        } else {
-            // Monochromatic
-            mat8u = Mat(mat.size(), CV_8UC1, Scalar((globalMin+globalMax)/2));
-        }
-    } else {
-        mat8u = mat;
-    }
-
-    // Convert to 3 channels
-    Mat mat8uc3;
-    if      (mat8u.channels() == 4) cvtColor(mat8u, mat8uc3, CV_BGRA2RGB);
-    else if (mat8u.channels() == 3) cvtColor(mat8u, mat8uc3, CV_BGR2RGB);
-    else if (mat8u.channels() == 1) cvtColor(mat8u, mat8uc3, CV_GRAY2RGB);
-
-    return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy();
-}
-
 class DisplayWindow : public QLabel
 {
     Q_OBJECT