Merge pull request #2409 from juanmanpr:master

modules/photo/src/contrast_preserve.cpp

@@ -45,7 +45,6 @@
 #include "math.h"
 #include <vector>
 #include <limits>
-#include <iostream>
 #include "contrast_preserve.hpp"
 
 using namespace std;
@@ -60,16 +59,7 @@ void cv::decolor(InputArray _src, OutputArray _dst, OutputArray _color_boost)
     _color_boost.create(I.size(), CV_8UC3);
     Mat color_boost = _color_boost.getMat();
 
-    if(!I.data )
-    {
-        cout <<  "Could not open or find the image" << endl ;
-        return;
-    }
-    if(I.channels() !=3)
-    {
-        cout << "Input Color Image" << endl;
-        return;
-    }
+    CV_Assert(!I.empty() && (I.channels()==3));
 
     // Parameter Setting
     int maxIter = 15;

modules/photo/src/seamless_cloning.cpp

@@ -41,7 +41,6 @@
 
 #include "precomp.hpp"
 #include "opencv2/photo.hpp"
-#include <iostream>
 #include <stdlib.h>
 
 #include "seamless_cloning.hpp"
@@ -93,11 +92,7 @@ void cv::seamlessClone(InputArray _src, InputArray _dst, InputArray _mask, Point
     int minyd = p.x - leny/2;
     int maxyd = p.x + leny/2;
 
-    if(minxd < 0 || minyd < 0 || maxxd > dest.size().height || maxyd > dest.size().width)
-    {
-        cout << "Index out of range" << endl;
-        exit(0);
-    }
+    CV_Assert(minxd >= 0 && minyd >= 0 && maxxd <= dest.rows && maxyd <= dest.cols);
 
     Rect roi_d(minyd,minxd,leny,lenx);
     Rect roi_s(miny,minx,leny,lenx);