added optional border value to cv::copyMakeBorder (SF #2796671)

git-svn-id: https://code.ros.org/svn/opencv/trunk@1959 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/cv.hpp b/opencv/include/opencv/cv.hpp
index 854c30cc1dc1a03db6c4beaf972f22e786c71cf3..405640619efe90e28ea4419303697fba931ad404 100644 (file)
--- a/opencv/include/opencv/cv.hpp
+++ b/opencv/include/opencv/cv.hpp
@@ -218,7 +218,7 @@ CV_EXPORTS Mat getStructuringElement(int shape, Size ksize, Point anchor=Point(-
 
 CV_EXPORTS void copyMakeBorder( const Mat& src, Mat& dst,
                                 int top, int bottom, int left, int right,
-                                int borderType );
+                                int borderType, const Scalar& value=Scalar() );
 
 CV_EXPORTS void medianBlur( const Mat& src, Mat& dst, int ksize );
 CV_EXPORTS void GaussianBlur( const Mat& src, Mat& dst, Size ksize,

diff --git a/opencv/src/cv/cvutils.cpp b/opencv/src/cv/cvutils.cpp
index 218dff60fbbea621a810a5636216d4677ab60df2..92ce32fe6384dd0bb6930f50f10a20f328fa9375 100644 (file)
--- a/opencv/src/cv/cvutils.cpp
+++ b/opencv/src/cv/cvutils.cpp
@@ -486,11 +486,11 @@ namespace cv
 {
 
 void copyMakeBorder( const Mat& src, Mat& dst, int top, int bottom,
-                     int left, int right, int borderType )
+                     int left, int right, int borderType, const Scalar& value )
 {
     dst.create( src.rows + top + bottom, src.cols + left + right, src.type() );
     CvMat _src = src, _dst = dst;
-    cvCopyMakeBorder( &_src, &_dst, Point(left, top), borderType );
+    cvCopyMakeBorder( &_src, &_dst, Point(left, top), borderType, value );
 }
 
 }