Merge pull request opencv#9997 from ElenaGvozdeva:GaussianBlur_bug

mshabunin · mshabunin · commit 73d4f12c1475 · 2017-11-17T13:37:28.000Z
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -508,15 +508,15 @@ Mat::Mat(int _rows, int _cols, int _type, void* _data, size_t _step)
     }
     else
     {
-        if( rows == 1 ) _step = minstep;
         CV_DbgAssert( _step >= minstep );
 
         if (_step % esz1 != 0)
         {
             CV_Error(Error::BadStep, "Step must be a multiple of esz1");
         }
 
-        flags |= _step == minstep ? CONTINUOUS_FLAG : 0;
+        if (_step == minstep || rows == 1)
+            flags |= CONTINUOUS_FLAG;
     }
     step[0] = _step;
     step[1] = esz;
@@ -541,15 +541,15 @@ Mat::Mat(Size _sz, int _type, void* _data, size_t _step)
     }
     else
     {
-        if( rows == 1 ) _step = minstep;
         CV_DbgAssert( _step >= minstep );
 
         if (_step % esz1 != 0)
         {
             CV_Error(Error::BadStep, "Step must be a multiple of esz1");
         }
 
-        flags |= _step == minstep ? CONTINUOUS_FLAG : 0;
+        if (_step == minstep || rows == 1)
+            flags |= CONTINUOUS_FLAG;
     }
     step[0] = _step;
     step[1] = esz;
diff --git a/modules/imgproc/test/test_filter.cpp b/modules/imgproc/test/test_filter.cpp
@@ -1982,6 +1982,27 @@ TEST(Imgproc_Blur, borderTypes)
     EXPECT_DOUBLE_EQ(0.0, cvtest::norm(expected_dst, dst, NORM_INF));
 }
 
+TEST(Imgproc_GaussianBlur, borderTypes)
+{
+    Size kernelSize(3, 3);
+
+    Mat src_16(16, 16, CV_8UC1, cv::Scalar::all(42)), dst_16;
+    Mat src_roi_16 = src_16(Rect(1, 1, 14, 14));
+    src_roi_16.setTo(cv::Scalar::all(3));
+
+    cv::GaussianBlur(src_roi_16, dst_16, kernelSize, 0, 0, BORDER_REPLICATE);
+
+    EXPECT_EQ(20, dst_16.at<uchar>(0, 0));
+
+    Mat src(3, 12, CV_8UC1, cv::Scalar::all(42)), dst;
+    Mat src_roi = src(Rect(1, 1, 10, 1));
+    src_roi.setTo(cv::Scalar::all(2));
+
+    cv::GaussianBlur(src_roi, dst, kernelSize, 0, 0, BORDER_REPLICATE);
+
+    EXPECT_EQ(27, dst.at<uchar>(0, 0));
+}
+
 TEST(Imgproc_Morphology, iterated)
 {
     RNG& rng = theRNG();

Original file line number	Diff line number	Diff line change
`@@ -508,15 +508,15 @@ Mat::Mat(int _rows, int _cols, int _type, void* _data, size_t _step)`
`508`	`508`	`}`
`509`	`509`	`else`
`510`	`510`	`{`
`511`		`- if( rows == 1 ) _step = minstep;`
`512`	`511`	`CV_DbgAssert( _step >= minstep );`
`513`	`512`
`514`	`513`	`if (_step % esz1 != 0)`
`515`	`514`	`{`
`516`	`515`	`CV_Error(Error::BadStep, "Step must be a multiple of esz1");`
`517`	`516`	`}`
`518`	`517`
`519`		`- flags \|= _step == minstep ? CONTINUOUS_FLAG : 0;`
	`518`	`+ if (_step == minstep \|\| rows == 1)`
	`519`	`+ flags \|= CONTINUOUS_FLAG;`
`520`	`520`	`}`
`521`	`521`	`step[0] = _step;`
`522`	`522`	`step[1] = esz;`
`@@ -541,15 +541,15 @@ Mat::Mat(Size _sz, int _type, void* _data, size_t _step)`
`541`	`541`	`}`
`542`	`542`	`else`
`543`	`543`	`{`
`544`		`- if( rows == 1 ) _step = minstep;`
`545`	`544`	`CV_DbgAssert( _step >= minstep );`
`546`	`545`
`547`	`546`	`if (_step % esz1 != 0)`
`548`	`547`	`{`
`549`	`548`	`CV_Error(Error::BadStep, "Step must be a multiple of esz1");`
`550`	`549`	`}`
`551`	`550`
`552`		`- flags \|= _step == minstep ? CONTINUOUS_FLAG : 0;`
	`551`	`+ if (_step == minstep \|\| rows == 1)`
	`552`	`+ flags \|= CONTINUOUS_FLAG;`
`553`	`553`	`}`
`554`	`554`	`step[0] = _step;`
`555`	`555`	`step[1] = esz;`