CV_Assert for photo module corrected

diff --git a/modules/photo/src/contrast_preserve.cpp b/modules/photo/src/contrast_preserve.cpp
index baafd6d..55ea321 100644 (file)
--- a/modules/photo/src/contrast_preserve.cpp
+++ b/modules/photo/src/contrast_preserve.cpp
@@ -59,7 +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();
 
-    CV_Assert((I.data) && (I.channels()==3));
+    CV_Assert(!I.empty() && (I.channels()==3));
 
     // Parameter Setting
     int maxIter = 15;

diff --git a/modules/photo/src/seamless_cloning.cpp b/modules/photo/src/seamless_cloning.cpp
index 9aece0f..6ddadb3 100644 (file)
--- a/modules/photo/src/seamless_cloning.cpp
+++ b/modules/photo/src/seamless_cloning.cpp
@@ -92,7 +92,7 @@ void cv::seamlessClone(InputArray _src, InputArray _dst, InputArray _mask, Point
     int minyd = p.x - leny/2;
     int maxyd = p.x + leny/2;
 
-    CV_Assert((minxd<0) && (minyd<0) && (maxxd>dest.size().height) && (maxyd>dest.size().width));
+    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);