Merge pull request #1031 from pengx17:2.4_fix_converTo

pull/1034/merge
Roman Donchenko 12 years ago committed by OpenCV Buildbot
commit 7cb047e2d9
  1. 2
      modules/ocl/src/matrix_operations.cpp

@ -394,7 +394,7 @@ void cv::ocl::oclMat::convertTo( oclMat &dst, int rtype, double alpha, double be
if( rtype < 0 ) if( rtype < 0 )
rtype = type(); rtype = type();
else else
rtype = CV_MAKETYPE(CV_MAT_DEPTH(rtype), oclchannels()); rtype = CV_MAKETYPE(CV_MAT_DEPTH(rtype), channels());
//int scn = channels(); //int scn = channels();
int sdepth = depth(), ddepth = CV_MAT_DEPTH(rtype); int sdepth = depth(), ddepth = CV_MAT_DEPTH(rtype);

Loading…
Cancel
Save