Merge remote-tracking branch 'upstream/3.4' into merge-3.4

7 years ago · dc6af711a7
parent 9adf7a58a0 89a7e84178
commit dc6af711a7
1 changed files with 2 additions and 2 deletions
--- a/modules/stereo/src/descriptor.cpp
+++ b/modules/stereo/src/descriptor.cpp
@ -226,8 +226,8 @@ namespace cv
        //integral image computation used in the Mean Variation Census Transform
        void imageMeanKernelSize(const Mat &image, int windowSize, Mat &cost)
        {
-            CV_Assert(image.size > 0);
-            CV_Assert(cost.size > 0);
+            CV_Assert(!image.empty());
+            CV_Assert(!cost.empty());
            CV_Assert(windowSize % 2 != 0);
            int win = windowSize / 2;
            float scalling = ((float) 1) / (windowSize * windowSize);