restored ocl_cvtcolor.cl

modules/core/src/ocl.cpp

@@ -41,7 +41,6 @@
 
 #include "precomp.hpp"
 #include <map>
-#include <iostream>
 
 /*
   Part of the file is an extract from the standard OpenCL headers from Khronos site.
@@ -2354,7 +2353,7 @@ struct Program::Impl
             retval = clBuildProgram(handle, n,
                                     (const cl_device_id*)deviceList,
                                     buildflags.c_str(), 0, 0);
-            if( retval < 0 /*== CL_BUILD_PROGRAM_FAILURE*/ )
+            if( retval == CL_BUILD_PROGRAM_FAILURE )
             {
                 char buf[1<<16];
                 size_t retsz = 0;

modules/imgproc/src/color.cpp

@@ -92,7 +92,6 @@
 #include "precomp.hpp"
 #include "opencl_kernels.hpp"
 #include <limits>
-#include <iostream>
 
 #define  CV_DESCALE(x,n)     (((x) + (1 << ((n)-1))) >> (n))
 
@@ -3045,8 +3044,8 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
     int stype = _src.type();
     int scn = CV_MAT_CN(stype), depth = CV_MAT_DEPTH(stype), bidx;
 
-    if( use_opencl /*&& ocl_cvtColor(_src, _dst, code, dcn)*/ )
-        return (void)ocl_cvtColor(_src, _dst, code, dcn);
+    if( use_opencl && ocl_cvtColor(_src, _dst, code, dcn) )
+        return;
 
     Mat src = _src.getMat(), dst;
     Size sz = src.size();