Merge pull request #16079 from alalek:imgproc_color_clarify_error_message

5 years ago · fb5db23463
parent 0a35b97e75 b369c456f2
commit fb5db23463
1 changed files with 4 additions and 1 deletions
--- a/modules/imgproc/src/color.hpp
+++ b/modules/imgproc/src/color.hpp
@ -224,7 +224,10 @@ struct OclHelper
        int scn = src.channels();
        int depth = src.depth();

-        CV_Assert( VScn::contains(scn) && VDcn::contains(dcn) && VDepth::contains(depth) );
+        CV_Check(scn, VScn::contains(scn), "Invalid number of channels in input image");
+        CV_Check(dcn, VDcn::contains(dcn), "Invalid number of channels in output image");
+        CV_CheckDepth(depth, VDepth::contains(depth), "Unsupported depth of input image");
+
        switch (sizePolicy)
        {
        case TO_YUV: