Merge remote-tracking branch 'origin/2.4' into merge-2.4

[profile/ivi/opencv.git] / modules / ocl / perf / perf_imgproc.cpp

diff --git a/modules/ocl/perf/perf_imgproc.cpp b/modules/ocl/perf/perf_imgproc.cpp
index e0ffe56..51b354f 100644 (file)
--- a/modules/ocl/perf/perf_imgproc.cpp
+++ b/modules/ocl/perf/perf_imgproc.cpp
@@ -426,10 +426,10 @@ static COOR do_meanShift(int x0, int y0, uchar *sptr, uchar *dptr, int sstep, cv
 static void meanShiftFiltering_(const Mat &src_roi, Mat &dst_roi, int sp, int sr, cv::TermCriteria crit)
 {
     if( src_roi.empty() )
-        CV_Error( CV_StsBadArg, "The input image is empty" );
+        CV_Error( Error::StsBadArg, "The input image is empty" );
 
     if( src_roi.depth() != CV_8U || src_roi.channels() != 4 )
-        CV_Error( CV_StsUnsupportedFormat, "Only 8-bit, 4-channel images are supported" );
+        CV_Error( Error::StsUnsupportedFormat, "Only 8-bit, 4-channel images are supported" );
 
     dst_roi.create(src_roi.size(), src_roi.type());
 
@@ -501,11 +501,11 @@ static void meanShiftProc_(const Mat &src_roi, Mat &dst_roi, Mat &dstCoor_roi, i
 {
     if (src_roi.empty())
     {
-        CV_Error(CV_StsBadArg, "The input image is empty");
+        CV_Error(Error::StsBadArg, "The input image is empty");
     }
     if (src_roi.depth() != CV_8U || src_roi.channels() != 4)
     {
-        CV_Error(CV_StsUnsupportedFormat, "Only 8-bit, 4-channel images are supported");
+        CV_Error(Error::StsUnsupportedFormat, "Only 8-bit, 4-channel images are supported");
     }
 
     dst_roi.create(src_roi.size(), src_roi.type());