fixed compiler warnings

Josh Klontz
1 parent e8e1b900
Showing 8 changed files with 12 additions and 19 deletions
openbr/core/opencvutils.cpp
openbr/core/qtutils.cpp
openbr/plugins/classification/dlib.cpp
openbr/plugins/classification/lda.cpp
openbr/plugins/cmake/vbb.cmake
openbr/plugins/gallery/vbb.cpp
openbr/plugins/gallery/vec.cpp
openbr/plugins/gui/adjacentoverlay.cpp
@@ -417,7 +417,7 @@ void OpenCVUtils::group(vector&lt;Rect&gt; &amp;rects, vector&lt;float&gt; &amp;confidences, float c
     vector<int> rweights(nClasses, 0);
     vector<float> rejectWeights(nClasses, -std::numeric_limits<float>::max());
-    for (int i = 0; i < labels.size(); i++)
+    for (size_t i = 0; i < labels.size(); i++)
     {
         int cls = labels[i];
         rrects[cls].x += rects[i].x;
@@ -430,7 +430,7 @@ void OpenCVUtils::group(vector&lt;Rect&gt; &amp;rects, vector&lt;float&gt; &amp;confidences, float c
     if (useConfidences)
     {
         // For each class, find maximum confidence
-        for (int i = 0; i < labels.size(); i++)
+        for (size_t i = 0; i < labels.size(); i++)
         {
             int cls = labels[i];
             if (confidences[i] > rejectWeights[cls])
@@ -533,7 +533,7 @@ bool BlockCompression::open(QIODevice::OpenMode mode)
         blockReader >> block_size;
         compressedBlock.resize(block_size);
         int read_count = blockReader.readRawData(compressedBlock.data(), block_size);
-        if (read_count != block_size)
+        if (read_count != int(block_size))
             qFatal("Failed to read initial block");
         decompressedBlock = qUncompress(compressedBlock);
@@ -572,7 +572,6 @@ void BlockCompression::setBasis(QIODevice *_basis)
 // block from basis
 qint64 BlockCompression::readData(char *data, qint64 remaining)
 {
-    qint64 initial = remaining;
     qint64 read = 0;
     while (remaining > 0) {
         // attempt to read the target amount of data
@@ -596,8 +595,8 @@ qint64 BlockCompression::readData(char *data, qint64 remaining)
             compressedBlock.resize(block_size);
             int actualRead = blockReader.readRawData(compressedBlock.data(), block_size);
-            if (actualRead != block_size)
-                qFatal("Bad read on nominal block size: %d, only got %d", block_size, remaining);
+            if (actualRead != int(block_size))
+                qFatal("Bad read on nominal block size: %d, only got %d", block_size, int(remaining));
             decompressedBlock = qUncompress(compressedBlock);
@@ -654,7 +653,7 @@ qint64 BlockCompression::writeData(const char *data, qint64 remaining)
                 blockWriter << block_size;
                 int write_count = blockWriter.writeRawData(compressedBlock.data(), block_size);
-                if (write_count != block_size)
+                if (write_count != int(block_size))
                     qFatal("Didn't write enough data");
             }
             else
@@ -6,7 +6,6 @@
 #include <dlib/image_processing/frontal_face_detector.h>
 #include <dlib/svm_threaded.h>
 #include <dlib/image_processing.h>
-#include <dlib/image_io.h>
 #include <dlib/opencv.h>
 #include <dlib/all/source.cpp>
@@ -614,7 +614,7 @@ class SparseLDATransform : public Transform
         assert(ldaOrig.projection.cols() == 1);
         float ldaStd = EigenUtils::stddev(ldaOrig.projection);
         for (int i = 0; i < ldaOrig.projection.rows(); i++)
-            if (abs(ldaOrig.projection(i)) > varThreshold * ldaStd)
+            if (abs(int(ldaOrig.projection(i))) > varThreshold * ldaStd)
                 selections.append(i);
         TemplateList newSet;
+if(NOT ${BR_WITH_CVMATIO})
+  set(BR_EXCLUDED_PLUGINS ${BR_EXCLUDED_PLUGINS} plugins/gallery/vbb.cpp)
+endif()
@@ -14,8 +14,6 @@
  * limitations under the License.                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#ifdef CVMATIO
-
 #include <openbr/plugins/openbr_internal.h>
 namespace br
@@ -92,5 +90,3 @@ BR_REGISTER(Gallery, vbbGallery)
 } // namespace br
 #include "gallery/vbb.moc"
-
-#endif
@@ -40,16 +40,12 @@ class vecGallery : public FileGallery
         if (write1 != sizeof(count) || write2 != sizeof(size) || write3 != sizeof(temp) || write4 != sizeof(temp))
             qFatal("Failed to write header.");
-        for (int i=0; i<count; i++) {
-            uchar tmp = 0;
-            const size_t write5 = f.write((char*)&tmp,sizeof(tmp));
-
+        for (int i=0; i<count; i++)
             for (int r = 0; r < height; r++)
                 for (int c = 0; c < width; c++) {
                     short buffer = mats[i].ptr(r)[c];
                     f.write((char*)&buffer, sizeof(buffer));
                 }
-        }
         f.close();
     }
@@ -127,7 +127,7 @@ class AdjacentOverlayTransform : public Transform
         if (clip_roi.height + target_location.top() >= outIm.rows)
         {
-            clip_roi.height -= abs(outIm.rows - (clip_roi.height + target_location.top() ));
+            clip_roi.height -= abs(int(outIm.rows - (clip_roi.height + target_location.top())));
         }
         if (clip_roi.x + clip_roi.width >= im.cols) {
             clip_roi.width -= abs(im.cols - (clip_roi.x + clip_roi.width + 1));