Merge pull request #32 from vbystricky/highgui_imgcodecs

modules/reg/samples/map_test.cpp

@@ -38,10 +38,12 @@
 #include <iostream>
 #define _USE_MATH_DEFINES
 #include <cmath>
+#include <opencv2/imgcodecs.hpp>
 #include <opencv2/highgui.hpp> // OpenCV window I/O
 #include <opencv2/imgproc.hpp> // OpenCV image transformations
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgproc/types_c.h>
+#include <opencv2/imgcodecs/imgcodecs_c.h>
 #include <opencv2/highgui/highgui_c.h>
 
 #ifdef COMPARE_FEATURES

modules/tracking/test/test_trackerSRE.cpp

@@ -343,32 +343,32 @@ void TrackerSRETest::checkDataTest()
           break;
         case 5:
           //corner shift top-left
-          bb.x = (int)round( bb.x -  0.1 * bb.width );
-          bb.y = (int)round( bb.y - 0.1 * bb.height );
+          bb.x = (int)cvRound( bb.x -  0.1 * bb.width );
+          bb.y = (int)cvRound( bb.y - 0.1 * bb.height );
 
           bb.width = xLimit - bb.x + 1;
           bb.height = yLimit - bb.y + 1;
           break;
         case 6:
           //corner shift top-right
-          xLimit = (int)round( xLimit + 0.1 * bb.width );
+          xLimit = (int)cvRound( xLimit + 0.1 * bb.width );
 
-          bb.y = (int)round( bb.y - 0.1 * bb.height );
+          bb.y = (int)cvRound( bb.y - 0.1 * bb.height );
           bb.width = xLimit - bb.x + 1;
           bb.height = yLimit - bb.y + 1;
           break;
         case 7:
           //corner shift bottom-left
-          bb.x = (int)round( bb.x - 0.1 * bb.width );
-          yLimit = (int)round( yLimit + 0.1 * bb.height );
+          bb.x = (int)cvRound( bb.x - 0.1 * bb.width );
+          yLimit = (int)cvRound( yLimit + 0.1 * bb.height );
 
           bb.width = xLimit - bb.x + 1;
           bb.height = yLimit - bb.y + 1;
           break;
         case 8:
           //corner shift bottom-right
-          xLimit = (int)round( xLimit + 0.1 * bb.width );
-          yLimit = (int)round( yLimit + 0.1 * bb.height );
+          xLimit = (int)cvRound( xLimit + 0.1 * bb.width );
+          yLimit = (int)cvRound( yLimit + 0.1 * bb.height );
 
           bb.width = xLimit - bb.x + 1;
           bb.height = yLimit - bb.y + 1;

modules/xobjdetect/src/precomp.hpp

@@ -48,7 +48,7 @@ the use of this software, even if advised of the possibility of such damage.
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgproc/types_c.h>
 
-#include <opencv2/highgui.hpp>
+#include <opencv2/imgcodecs.hpp>
 
 #include <algorithm>
 #include <cmath>