Warning fixes continued

cmake/OpenCVCompilerOptions.cmake

@@ -75,7 +75,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   #add_extra_compiler_option(-Wcast-align)
   #add_extra_compiler_option(-Wstrict-aliasing=2)
   #add_extra_compiler_option(-Wshadow)
-  add_extra_compiler_option(-Wno-unnamed-type-template-args)
+  #add_extra_compiler_option(-Wno-unnamed-type-template-args)
 
   # The -Wno-long-long is required in 64bit systems when including sytem headers.
   if(X86_64)

cmake/OpenCVDetectTBB.cmake

@@ -10,7 +10,7 @@ elseif(UNIX AND NOT APPLE)
   if(TBB_FOUND)
     set(HAVE_TBB 1)
     if(NOT ${TBB_INCLUDE_DIRS} STREQUAL "")
-      include_directories(SYSTEM ${TBB_INCLUDE_DIRS})
+      ocv_include_directories(${TBB_INCLUDE_DIRS})
     endif()
     link_directories(${TBB_LIBRARY_DIRS})
     set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} ${TBB_LIBRARIES})
@@ -63,7 +63,7 @@ if(NOT HAVE_TBB)
 
     set(HAVE_TBB 1)
     if(NOT "${TBB_INCLUDE_DIRS}" STREQUAL "")
-      include_directories(SYSTEM "${TBB_INCLUDE_DIRS}")
+      ocv_include_directories("${TBB_INCLUDE_DIRS}")
     endif()
   endif(TBB_INCLUDE_DIRS)
 endif(NOT HAVE_TBB)

cmake/OpenCVUtils.cmake

@@ -19,7 +19,7 @@ function(ocv_include_directories)
     if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}")
       list(APPEND __add_before "${dir}")
     else()
-      include_directories(AFTER "${dir}")
+      include_directories(AFTER SYSTEM "${dir}")
     endif()
   endforeach()
   include_directories(BEFORE ${__add_before})

modules/calib3d/src/calibinit.cpp

@@ -230,7 +230,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
     int found = 0;
     CvCBQuad *quads = 0, **quad_group = 0;
     CvCBCorner *corners = 0, **corner_group = 0;
-    
+
     try
     {
     int k = 0;
@@ -252,11 +252,11 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
 
     if( out_corner_count )
         *out_corner_count = 0;
-    
+
     IplImage _img;
     int check_chessboard_result;
-    int quad_count = 0, group_idx = 0, i = 0, dilations = 0;
-    
+    int quad_count = 0, group_idx = 0, dilations = 0;
+
     img = cvGetMat( img, &stub );
     //debug_img = img;
 
@@ -316,8 +316,8 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
         for( dilations = min_dilations; dilations <= max_dilations; dilations++ )
         {
             if (found)
-                break;		// already found it
-            
+                break;      // already found it
+
             cvFree(&quads);
             cvFree(&corners);
 
@@ -378,7 +378,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
             cvCopy(dbg_img, dbg1_img);
             cvNamedWindow("all_quads", 1);
             // copy corners to temp array
-            for( i = 0; i < quad_count; i++ )
+            for(int i = 0; i < quad_count; i++ )
             {
                 for (int k=0; k<4; k++)
                 {
@@ -432,7 +432,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
                 cvCopy(dbg_img,dbg2_img);
                 cvNamedWindow("connected_group", 1);
                 // copy corners to temp array
-                for( i = 0; i < quad_count; i++ )
+                for(int i = 0; i < quad_count; i++ )
                 {
                     if (quads[i].group_idx == group_idx)
                         for (int k=0; k<4; k++)
@@ -455,7 +455,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
 #endif
 
                 if (count == 0)
-                    continue;		// haven't found inner quads
+                    continue;       // haven't found inner quads
 
 
                 // If count is more than it should be, this will remove those quads
@@ -472,7 +472,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
                 float sum_dist = 0;
                 int total = 0;
 
-                for( i = 0; i < n; i++ )
+                for(int i = 0; i < n; i++ )
                 {
                     int ni = 0;
                     float avgi = corner_group[i]->meanDist(&ni);
@@ -484,7 +484,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
                 if( count > 0 || (out_corner_count && -count > *out_corner_count) )
                 {
                     // copy corners to output array
-                    for( i = 0; i < n; i++ )
+                    for(int i = 0; i < n; i++ )
                         out_corners[i] = corner_group[i]->pt;
 
                     if( out_corner_count )
@@ -505,19 +505,19 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
     if( found )
         found = icvCheckBoardMonotony( out_corners, pattern_size );
 
-	// check that none of the found corners is too close to the image boundary
+    // check that none of the found corners is too close to the image boundary
     if( found )
-	{
-		const int BORDER = 8;
-		for( k = 0; k < pattern_size.width*pattern_size.height; k++ )
-		{
-			if( out_corners[k].x <= BORDER || out_corners[k].x > img->cols - BORDER ||
-			    out_corners[k].y <= BORDER || out_corners[k].y > img->rows - BORDER )
-				break;
-		}
-		
-		found = k == pattern_size.width*pattern_size.height;
-	}
+    {
+        const int BORDER = 8;
+        for( k = 0; k < pattern_size.width*pattern_size.height; k++ )
+        {
+            if( out_corners[k].x <= BORDER || out_corners[k].x > img->cols - BORDER ||
+                out_corners[k].y <= BORDER || out_corners[k].y > img->rows - BORDER )
+                break;
+        }
+
+        found = k == pattern_size.width*pattern_size.height;
+    }
 
     if( found && pattern_size.height % 2 == 0 && pattern_size.width % 2 == 0 )
     {
@@ -525,8 +525,8 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
         double dy0 = out_corners[last_row].y - out_corners[0].y;
         if( dy0 < 0 )
         {
-            int i, n = pattern_size.width*pattern_size.height;
-            for( i = 0; i < n/2; i++ )
+            int n = pattern_size.width*pattern_size.height;
+            for(int i = 0; i < n/2; i++ )
             {
                 CvPoint2D32f temp;
                 CV_SWAP(out_corners[i], out_corners[n-i-1], temp);
@@ -559,7 +559,7 @@ int cvFindChessboardCorners( const void* arr, CvSize pattern_size,
         cvFree(&corner_group);
         throw;
     }
-    
+
     cvFree(&quads);
     cvFree(&corners);
     cvFree(&quad_group);
@@ -582,7 +582,7 @@ static int
 icvCheckBoardMonotony( CvPoint2D32f* corners, CvSize pattern_size )
 {
     int i, j, k;
-    
+
     for( k = 0; k < 2; k++ )
     {
         for( i = 0; i < (k == 0 ? pattern_size.height : pattern_size.width); i++ )
@@ -627,11 +627,10 @@ icvOrderFoundConnectedQuads( int quad_count, CvCBQuad **quads,
 {
     cv::Ptr<CvMemStorage> temp_storage = cvCreateChildMemStorage( storage );
     CvSeq* stack = cvCreateSeq( 0, sizeof(*stack), sizeof(void*), temp_storage );
-    int i;
 
     // first find an interior quad
     CvCBQuad *start = NULL;
-    for (i=0; i<quad_count; i++)
+    for (int i=0; i<quad_count; i++)
     {
         if (quads[i]->count == 4)
         {
@@ -682,7 +681,7 @@ icvOrderFoundConnectedQuads( int quad_count, CvCBQuad **quads,
             case 1:
                 col += 2; break;
             case 2:
-                row += 2;	break;
+                row += 2;   break;
             case 3:
                 col -= 2; break;
             }
@@ -700,7 +699,7 @@ icvOrderFoundConnectedQuads( int quad_count, CvCBQuad **quads,
         }
     }
 
-    for (i=col_min; i<=col_max; i++)
+    for (int i=col_min; i<=col_max; i++)
         PRINTF("HIST[%d] = %d\n", i, col_hist[i]);
 
     // analyze inner quad structure
@@ -763,7 +762,7 @@ icvOrderFoundConnectedQuads( int quad_count, CvCBQuad **quads,
     // if there is an outer quad missing, fill it in
     // first order all inner quads
     int found = 0;
-    for (i=0; i<quad_count; i++)
+    for (int i=0; i<quad_count; i++)
     {
         if (quads[i]->count == 4)
         {   // ok, look at neighbors
@@ -778,7 +777,7 @@ icvOrderFoundConnectedQuads( int quad_count, CvCBQuad **quads,
                 case 1:
                     col += 2; break;
                 case 2:
-                    row += 2;	break;
+                    row += 2;   break;
                 case 3:
                     col -= 2; break;
                 }
@@ -817,7 +816,7 @@ icvOrderFoundConnectedQuads( int quad_count, CvCBQuad **quads,
 
 
     // final trimming of outer quads
-    if (dcol == w && drow == h)	// found correct inner quads
+    if (dcol == w && drow == h) // found correct inner quads
     {
         PRINTF("Inner bounds ok, check outer quads\n");
         int rcount = quad_count;
@@ -832,7 +831,7 @@ icvOrderFoundConnectedQuads( int quad_count, CvCBQuad **quads,
                     if (quads[i]->neighbors[j] && quads[i]->neighbors[j]->ordered)
                         outer = true;
                 }
-                if (!outer)	// not an outer quad, eliminate
+                if (!outer) // not an outer quad, eliminate
                 {
                     PRINTF("Removing quad %d\n", i);
                     icvRemoveQuadFromGroup(quads,rcount,quads[i]);
@@ -876,7 +875,7 @@ icvAddOuterQuad( CvCBQuad *quad, CvCBQuad **quads, int quad_count,
             quad->count += 1;
             q->neighbors[j] = quad;
             q->group_idx = quad->group_idx;
-            q->count = 1;	// number of neighbors
+            q->count = 1;   // number of neighbors
             q->ordered = false;
             q->edge_len = quad->edge_len;
 
@@ -1262,7 +1261,7 @@ icvCheckQuadGroup( CvCBQuad **quad_group, int quad_count,
     int width = 0, height = 0;
     int hist[5] = {0,0,0,0,0};
     CvCBCorner* first = 0, *first2 = 0, *right, *cur, *below, *c;
-    
+
     // build dual graph, which vertices are internal quad corners
     // and two vertices are connected iff they lie on the same quad edge
     for( i = 0; i < quad_count; i++ )
@@ -1485,7 +1484,7 @@ icvCheckQuadGroup( CvCBQuad **quad_group, int quad_count,
     result = corner_count;
 
 finalize:
-    
+
     if( result <= 0 )
     {
         corner_count = MIN( corner_count, pattern_size.width*pattern_size.height );
@@ -1697,7 +1696,7 @@ icvGenerateQuads( CvCBQuad **out_quads, CvCBCorner **out_corners,
                                             CV_POLY_APPROX_DP, (float)approx_level );
                 if( dst_contour->total == 4 )
                     break;
-                
+
                 // we call this again on its own output, because sometimes
                 // cvApproxPoly() does not simplify as much as it should.
                 dst_contour = cvApproxPoly( dst_contour, sizeof(CvContour), temp_storage,
@@ -2006,17 +2005,17 @@ bool cv::findCirclesGrid( InputArray _image, Size patternSize,
 #endif
       if (isFound)
       {
-      	switch(parameters.gridType)
-      	{
+        switch(parameters.gridType)
+        {
           case CirclesGridFinderParameters::SYMMETRIC_GRID:
             boxFinder.getHoles(centers);
             break;
           case CirclesGridFinderParameters::ASYMMETRIC_GRID:
-	    boxFinder.getAsymmetricHoles(centers);
-	    break;
+        boxFinder.getAsymmetricHoles(centers);
+        break;
           default:
             CV_Error(CV_StsBadArg, "Unkown pattern type");
-      	}
+        }
 
         if (i != 0)
         {
@@ -2027,7 +2026,7 @@ bool cv::findCirclesGrid( InputArray _image, Size patternSize,
         Mat(centers).copyTo(_centers);
         return true;
       }
-      
+
       boxFinder.getHoles(centers);
       if (i != attempts - 1)
       {

modules/calib3d/src/calibration.cpp

@@ -1153,7 +1153,7 @@ CV_IMPL void cvFindExtrinsicCameraParams2( const CvMat* objectPoints,
                   int useExtrinsicGuess )
 {
     const int max_iter = 20;
-    Ptr<CvMat> matM, _Mxy, _m, _mn, matL, matJ;
+    Ptr<CvMat> matM, _Mxy, _m, _mn, matL;
 
     int i, count;
     double a[9], ar[9]={1,0,0,0,1,0,0,0,1}, R[9];

modules/calib3d/src/circlesgrid.cpp

@@ -65,14 +65,14 @@ void drawPoints(const vector<Point2f> &points, Mat &outImage, int radius = 2,  S
 }
 #endif
 
-void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> points, const Size &patternSize, vector<Point2f> &patternPoints)
+void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> points, const Size &patternSz, vector<Point2f> &patternPoints)
 {
 #ifdef HAVE_TEGRA_OPTIMIZATION
-    if(tegra::hierarchicalClustering(points, patternSize, patternPoints))
+    if(tegra::hierarchicalClustering(points, patternSz, patternPoints))
         return;
 #endif
-    int i, j, n = (int)points.size();
-    size_t pn = static_cast<size_t>(patternSize.area());
+    int j, n = (int)points.size();
+    size_t pn = static_cast<size_t>(patternSz.area());
 
     patternPoints.clear();
     if (pn >= points.size())
@@ -84,7 +84,7 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
 
     Mat dists(n, n, CV_32FC1, Scalar(0));
     Mat distsMask(dists.size(), CV_8UC1, Scalar(0));
-    for(i = 0; i < n; i++)
+    for(int i = 0; i < n; i++)
     {
         for(j = i+1; j < n; j++)
         {
@@ -122,7 +122,7 @@ void CirclesGridClusterFinder::hierarchicalClustering(const vector<Point2f> poin
     }
 
     //the largest cluster can have more than pn points -- we need to filter out such situations
-    if(clusters[patternClusterIdx].size() != static_cast<size_t>(patternSize.area()))
+    if(clusters[patternClusterIdx].size() != static_cast<size_t>(patternSz.area()))
     {
       return;
     }
@@ -505,11 +505,11 @@ void Graph::floydWarshall(cv::Mat &distanceMatrix, int infinity) const
     {
       for (Vertices::const_iterator it3 = vertices.begin(); it3 != vertices.end(); it3++)
       {
-	    int i1 = (int)it1->first, i2 = (int)it2->first, i3 = (int)it3->first;
+      int i1 = (int)it1->first, i2 = (int)it2->first, i3 = (int)it3->first;
         int val1 = distanceMatrix.at<int> (i2, i3);
         int val2;
         if (distanceMatrix.at<int> (i2, i1) == infinity ||
-			distanceMatrix.at<int> (i1, i3) == infinity)
+      distanceMatrix.at<int> (i1, i3) == infinity)
           val2 = val1;
         else
         {

modules/calib3d/src/solvepnp.cpp

@@ -253,10 +253,10 @@ namespace cv
                     }
                 }
             }
-            PnPSolver(const Mat& objectPoints, const Mat& imagePoints, const Parameters& parameters,
-                      Mat& rvec, Mat& tvec, vector<int>& inliers):
-            objectPoints(objectPoints), imagePoints(imagePoints), parameters(parameters),
-            rvec(rvec), tvec(tvec), inliers(inliers)
+            PnPSolver(const Mat& _objectPoints, const Mat& _imagePoints, const Parameters& _parameters,
+                      Mat& _rvec, Mat& _tvec, vector<int>& _inliers):
+            objectPoints(_objectPoints), imagePoints(_imagePoints), parameters(_parameters),
+            rvec(_rvec), tvec(_tvec), inliers(_inliers)
             {
                 rvec.copyTo(initRvec);
                 tvec.copyTo(initTvec);

modules/calib3d/test/test_homography.cpp

@@ -86,20 +86,20 @@ protected:
     double sigma;
 
 private:
-	float max_diff, max_2diff;
-	bool check_matrix_size(const cv::Mat& H);
-	bool check_matrix_diff(const cv::Mat& original, const cv::Mat& found, const int norm_type, double &diff);
+    float max_diff, max_2diff;
+    bool check_matrix_size(const cv::Mat& H);
+    bool check_matrix_diff(const cv::Mat& original, const cv::Mat& found, const int norm_type, double &diff);
     int check_ransac_mask_1(const Mat& src, const Mat& mask);
-	int check_ransac_mask_2(const Mat& original_mask, const Mat& found_mask);
-
-	void print_information_1(int j, int N, int method, const Mat& H);
-	void print_information_2(int j, int N, int method, const Mat& H, const Mat& H_res, int k, double diff);
-	void print_information_3(int j, int N, const Mat& mask);
-	void print_information_4(int method, int j, int N, int k, int l, double diff);
-	void print_information_5(int method, int j, int N, int l, double diff);
-	void print_information_6(int j, int N, int k, double diff, bool value);
-	void print_information_7(int j, int N, int k, double diff, bool original_value, bool found_value);
-	void print_information_8(int j, int N, int k, int l, double diff);
+    int check_ransac_mask_2(const Mat& original_mask, const Mat& found_mask);
+
+    void print_information_1(int j, int N, int method, const Mat& H);
+    void print_information_2(int j, int N, int method, const Mat& H, const Mat& H_res, int k, double diff);
+    void print_information_3(int j, int N, const Mat& mask);
+    void print_information_4(int method, int j, int N, int k, int l, double diff);
+    void print_information_5(int method, int j, int N, int l, double diff);
+    void print_information_6(int j, int N, int k, double diff, bool value);
+    void print_information_7(int j, int N, int k, double diff, bool original_value, bool found_value);
+    void print_information_8(int j, int N, int k, int l, double diff);
 };
 
 CV_HomographyTest::CV_HomographyTest() : max_diff(1e-2f), max_2diff(2e-2f)
@@ -112,7 +112,7 @@ CV_HomographyTest::CV_HomographyTest() : max_diff(1e-2f), max_2diff(2e-2f)
 
 CV_HomographyTest::~CV_HomographyTest() {}
 
-bool CV_HomographyTest::check_matrix_size(const cv::Mat& H) 
+bool CV_HomographyTest::check_matrix_size(const cv::Mat& H)
 {
     return (H.rows == 3) && (H.cols == 3);
 }
@@ -138,25 +138,25 @@ int CV_HomographyTest::check_ransac_mask_2(const Mat& original_mask, const Mat&
     return 0;
 }
 
-void CV_HomographyTest::print_information_1(int j, int N, int method, const Mat& H)
+void CV_HomographyTest::print_information_1(int j, int N, int _method, const Mat& H)
 {
     cout << endl; cout << "Checking for homography matrix sizes..." << endl; cout << endl;
     cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else  cout << "vector <Point2f>";
     cout << "   Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
     cout << "Count of points: " << N << endl; cout << endl;
-    cout << "Method: "; if (method == 0) cout << 0; else if (method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl;
+    cout << "Method: "; if (_method == 0) cout << 0; else if (_method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl;
     cout << "Homography matrix:" << endl; cout << endl;
     cout << H << endl; cout << endl;
     cout << "Number of rows: " << H.rows << "   Number of cols: " << H.cols << endl; cout << endl;
 }
 
-void CV_HomographyTest::print_information_2(int j, int N, int method, const Mat& H, const Mat& H_res, int k, double diff)
+void CV_HomographyTest::print_information_2(int j, int N, int _method, const Mat& H, const Mat& H_res, int k, double diff)
 {
     cout << endl; cout << "Checking for accuracy of homography matrix computing..." << endl; cout << endl;
     cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else  cout << "vector <Point2f>";
     cout << "   Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
     cout << "Count of points: " << N << endl; cout << endl;
-    cout << "Method: "; if (method == 0) cout << 0; else if (method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl;
+    cout << "Method: "; if (_method == 0) cout << 0; else if (_method == 8) cout << "RANSAC"; else cout << "LMEDS"; cout << endl;
     cout << "Original matrix:" << endl; cout << endl;
     cout << H << endl; cout << endl;
     cout << "Found matrix:" << endl; cout << endl;
@@ -178,10 +178,10 @@ void CV_HomographyTest::print_information_3(int j, int N, const Mat& mask)
     cout << "Number of rows: " << mask.rows << "   Number of cols: " << mask.cols << endl; cout << endl;
 }
 
-void CV_HomographyTest::print_information_4(int method, int j, int N, int k, int l, double diff)
+void CV_HomographyTest::print_information_4(int _method, int j, int N, int k, int l, double diff)
 {
     cout << endl; cout << "Checking for accuracy of reprojection error computing..." << endl; cout << endl;
-    cout << "Method: "; if (method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl;
+    cout << "Method: "; if (_method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl;
     cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else  cout << "vector <Point2f>";
     cout << "   Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
     cout << "Sigma of normal noise: " << sigma << endl;
@@ -192,10 +192,10 @@ void CV_HomographyTest::print_information_4(int method, int j, int N, int k, int
     cout << "Maxumum allowed difference: " << max_2diff << endl; cout << endl;
 }
 
-void CV_HomographyTest::print_information_5(int method, int j, int N, int l, double diff)
-{ 
+void CV_HomographyTest::print_information_5(int _method, int j, int N, int l, double diff)
+{
     cout << endl; cout << "Checking for accuracy of reprojection error computing..." << endl; cout << endl;
-    cout << "Method: "; if (method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl;
+    cout << "Method: "; if (_method == 0) cout << 0 << endl; else cout << "CV_LMEDS" << endl;
     cout << "Type of srcPoints: "; if ((j>-1) && (j<2)) cout << "Mat of CV_32FC2"; else  cout << "vector <Point2f>";
     cout << "   Type of dstPoints: "; if (j % 2 == 0) cout << "Mat of CV_32FC2"; else cout << "vector <Point2f>"; cout << endl;
     cout << "Sigma of normal noise: " << sigma << endl;
@@ -371,7 +371,7 @@ void CV_HomographyTest::run(int)
                         if (code)
                         {
                             print_information_3(j, N, mask[j]);
-							
+
                             switch (code)
                             {
                             case 1: { CV_Error(CALIB3D_HOMOGRAPHY_ERROR_RANSAC_MASK, MESSAGE_RANSAC_MASK_1); break; }
@@ -380,7 +380,7 @@ void CV_HomographyTest::run(int)
 
                             default: break;
                             }
-							
+
                             return;
                         }
 
@@ -412,7 +412,7 @@ void CV_HomographyTest::run(int)
             {
             case 0:
             case CV_LMEDS:
-				{
+                {
                     Mat H_res_64 [4] = { cv::findHomography(src_mat_2f, dst_mat_2f),
                                          cv::findHomography(src_mat_2f, dst_vec),
                                          cv::findHomography(src_vec, dst_mat_2f),
@@ -465,7 +465,7 @@ void CV_HomographyTest::run(int)
                     }
 
                     continue;
-				}
+                }
             case CV_RANSAC:
                 {
                     cv::Mat mask_res [4];
@@ -555,7 +555,7 @@ void CV_HomographyTest::run(int)
                             }
                         }
                     }
-					
+
                     continue;
                 }
 

modules/highgui/CMakeLists.txt

@@ -134,7 +134,7 @@ endif()
 
 if(HAVE_OPENNI)
   list(APPEND highgui_srcs src/cap_openni.cpp)
-  include_directories(AFTER SYSTEM ${OPENNI_INCLUDE_DIR})
+  ocv_include_directories(${OPENNI_INCLUDE_DIR})
   list(APPEND HIGHGUI_LIBRARIES ${OPENNI_LIBRARY})
 endif(HAVE_OPENNI)