Merge pull request #1031 from pengx17:2.4_fix_converTo

7cb047e2 · Roman Donchenko · OpenCV Buildbot · 4ed3d33d · c1f4fe16 · 7cb047e2
Commit 7cb047e2 authored Jun 24, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jun 24, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

matrix_operations.cpp modules/ocl/src/matrix_operations.cpp +1 -1

No files found.
--- a/modules/ocl/src/matrix_operations.cpp
+++ b/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 )
        rtype = type();
    else
-        rtype = CV_MAKETYPE(CV_MAT_DEPTH(rtype), oclchannels());
+        rtype = CV_MAKETYPE(CV_MAT_DEPTH(rtype), channels());

    //int scn = channels();
    int sdepth = depth(), ddepth = CV_MAT_DEPTH(rtype);