Merge remote-tracking branch 'upstream/3.4' into merge-3.4

samples/cpp/3calibration.cpp

@@ -250,7 +250,7 @@ int main( int argc, char** argv )
         {
             int k1 = k == 0 ? 2 : k == 1 ? 0 : 1;
             printf("%s\n", imageList[i*3+k].c_str());
-            view = imread(imageList[i*3+k], 1);
+            view = imread(imageList[i*3+k], IMREAD_COLOR);
 
             if(!view.empty())
             {
@@ -338,7 +338,7 @@ int main( int argc, char** argv )
         {
             int k1 = k == 0 ? 2 : k == 1 ? 0 : 1;
             int k2 = k == 0 ? 1 : k == 1 ? 0 : 2;
-            view = imread(imageList[i*3+k], 1);
+            view = imread(imageList[i*3+k], IMREAD_COLOR);
 
             if(view.empty())
                 continue;

samples/cpp/calibration.cpp

@@ -496,7 +496,7 @@ int main( int argc, char** argv )
             view0.copyTo(view);
         }
         else if( i < (int)imageList.size() )
-            view = imread(imageList[i], 1);
+            view = imread(imageList[i], IMREAD_COLOR);
 
         if(view.empty())
         {
@@ -621,7 +621,7 @@ int main( int argc, char** argv )
 
         for( i = 0; i < (int)imageList.size(); i++ )
         {
-            view = imread(imageList[i], 1);
+            view = imread(imageList[i], IMREAD_COLOR);
             if(view.empty())
                 continue;
             remap(view, rview, map1, map2, INTER_LINEAR);

samples/cpp/facedetect.cpp

@@ -145,7 +145,7 @@ int main( int argc, const char** argv )
                         len--;
                     buf[len] = '\0';
                     cout << "file " << buf << endl;
-                    image = imread( buf, 1 );
+                    image = imread( buf, IMREAD_COLOR );
                     if( !image.empty() )
                     {
                         detectAndDraw( image, cascade, nestedCascade, scale, tryflip );

samples/cpp/pca.cpp

@@ -59,7 +59,7 @@ static void read_imgList(const string& filename, vector<Mat>& images) {
     }
     string line;
     while (getline(file, line)) {
-        images.push_back(imread(line, 0));
+        images.push_back(imread(line, IMREAD_GRAYSCALE));
     }
 }
 

samples/cpp/stereo_calib.cpp

@@ -80,7 +80,7 @@ StereoCalib(const vector<string>& imagelist, Size boardSize, float squareSize, b
         for( k = 0; k < 2; k++ )
         {
             const string& filename = imagelist[i*2+k];
-            Mat img = imread(filename, 0);
+            Mat img = imread(filename, IMREAD_GRAYSCALE);
             if(img.empty())
                 break;
             if( imageSize == Size() )
@@ -298,7 +298,7 @@ StereoCalib(const vector<string>& imagelist, Size boardSize, float squareSize, b
     {
         for( k = 0; k < 2; k++ )
         {
-            Mat img = imread(goodImageList[i*2+k], 0), rimg, cimg;
+            Mat img = imread(goodImageList[i*2+k], IMREAD_GRAYSCALE), rimg, cimg;
             remap(img, rimg, rmap[k][0], rmap[k][1], INTER_LINEAR);
             cvtColor(rimg, cimg, COLOR_GRAY2BGR);
             Mat canvasPart = !isVerticalStereo ? canvas(Rect(w*k, 0, w, h)) : canvas(Rect(0, h*k, w, h));

samples/cpp/tutorial_code/snippets/imgproc_HoughLinesCircles.cpp

@@ -8,7 +8,7 @@ using namespace std;
 int main(int argc, char** argv)
 {
     Mat img, gray;
-    if( argc != 2 || !(img=imread(argv[1], 1)).data)
+    if( argc != 2 || !(img=imread(argv[1], IMREAD_COLOR)).data)
         return -1;
     cvtColor(img, gray, COLOR_BGR2GRAY);
     // smooth it, otherwise a lot of false circles may be detected

samples/cpp/tutorial_code/snippets/imgproc_HoughLinesP.cpp

@@ -7,7 +7,7 @@ using namespace std;
 int main(int argc, char** argv)
 {
     Mat src, dst, color_dst;
-    if( argc != 2 || !(src=imread(argv[1], 0)).data)
+    if( argc != 2 || !(src=imread(argv[1], IMREAD_GRAYSCALE)).data)
         return -1;
 
     Canny( src, dst, 50, 200, 3 );

samples/cpp/tutorial_code/snippets/imgproc_calcHist.cpp

@@ -6,7 +6,7 @@ using namespace cv;
 int main( int argc, char** argv )
 {
     Mat src, hsv;
-    if( argc != 2 || !(src=imread(argv[1], 1)).data )
+    if( argc != 2 || !(src=imread(argv[1], IMREAD_COLOR)).data )
         return -1;
 
     cvtColor(src, hsv, COLOR_BGR2HSV);

samples/cpp/tutorial_code/snippets/imgproc_drawContours.cpp

@@ -9,7 +9,7 @@ int main( int argc, char** argv )
     Mat src;
     // the first command-line parameter must be a filename of the binary
     // (black-n-white) image
-    if( argc != 2 || !(src=imread(argv[1], 0)).data)
+    if( argc != 2 || !(src=imread(argv[1], IMREAD_GRAYSCALE)).data)
         return -1;
 
     Mat dst = Mat::zeros(src.rows, src.cols, CV_8UC3);

samples/cpp/watershed.cpp

@@ -54,7 +54,7 @@ int main( int argc, char** argv )
         return 0;
     }
     string filename = samples::findFile(parser.get<string>("@input"));
-    Mat img0 = imread(filename, 1), imgGray;
+    Mat img0 = imread(filename, IMREAD_COLOR), imgGray;
 
     if( img0.empty() )
     {