Merge pull request #335 from justadudewhohacks/#331

fixed border value for warping methods

Author: justadudewhohacks

cc/core/MatImgprocBindings.h

@@ -296,6 +296,7 @@ namespace MatImgprocBindings {
     cv::Size2d size;
     int flags = cv::INTER_LINEAR;
     int borderMode = cv::BORDER_CONSTANT;
+	cv::Vec3d borderValue = cv::Vec3d();
 
     cv::Mat warpedMat;
 
@@ -311,7 +312,8 @@ namespace MatImgprocBindings {
       return (
         Size::Converter::optArg(1, &size, info) ||
         IntConverter::optArg(2, &flags, info) ||
-        IntConverter::optArg(3, &borderMode, info)
+        IntConverter::optArg(3, &borderMode, info) ||
+		Vec3::Converter::optArg(4, &borderValue, info)
       );
     }
 
@@ -324,7 +326,8 @@ namespace MatImgprocBindings {
       return (
         Size::Converter::optProp(&size, "size", opts) ||
         IntConverter::optProp(&flags, "flags", opts) ||
-        IntConverter::optProp(&borderMode, "borderMode", opts)
+        IntConverter::optProp(&borderMode, "borderMode", opts) ||
+		Vec3::Converter::optProp(&borderValue, "borderValue", opts)
       );
     }
   };
@@ -334,7 +337,7 @@ namespace MatImgprocBindings {
     }
 
     std::string executeCatchCvExceptionWorker() {
-      cv::warpAffine(mat, warpedMat, transformationMatrix, (cv::Size)size, flags, borderMode, cv::Scalar());
+      cv::warpAffine(mat, warpedMat, transformationMatrix, (cv::Size)size, flags, borderMode, borderValue);
       return "";
     }
   };
@@ -344,7 +347,7 @@ namespace MatImgprocBindings {
     }
 
     std::string executeCatchCvExceptionWorker() {
-      cv::warpPerspective(mat, warpedMat, transformationMatrix, (cv::Size)size, flags, borderMode, cv::Scalar());
+      cv::warpPerspective(mat, warpedMat, transformationMatrix, (cv::Size)size, flags, borderMode, borderValue);
       return "";
     }
   };

lib/typings/Mat.d.ts

@@ -292,10 +292,10 @@ export class Mat {
   triangulatePointsAsync(projPoints1: Point2[], projPoints2: Point2[]): Promise<Mat>;
   validateDisparity(cost: Mat, minDisparity: number, numberOfDisparities: number, disp12MaxDisp?: number): void;
   validateDisparityAsync(cost: Mat, minDisparity: number, numberOfDisparities: number, disp12MaxDisp?: number): Promise<void>;
-  warpAffine(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number): Mat;
-  warpAffineAsync(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number): Promise<Mat>;
-  warpPerspective(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number): Mat;
-  warpPerspectiveAsync(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number): Promise<Mat>;
+  warpAffine(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number, borderValue?: Vec3): Mat;
+  warpAffineAsync(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number, borderValue?: Vec3): Promise<Mat>;
+  warpPerspective(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number, borderValue?: Vec3): Mat;
+  warpPerspectiveAsync(transforMationMatrix: Mat, size?: Size, flags?: number, borderMode?: number, borderValue?: Vec3): Promise<Mat>;
   watershed(markers: Mat): Mat;
   watershedAsync(markers: Mat): Promise<Mat>;
 

test/tests/core/Mat/imgprocTests.js

@@ -241,7 +241,8 @@ module.exports = (getTestImg) => {
       getOptionalArgsMap: () => ([
         ['size', size],
         ['flags', cv.INTER_CUBIC],
-        ['borderMode', cv.BORDER_REFLECT]
+        ['borderMode', cv.BORDER_CONSTANT],
+        ['borderValue', new cv.Vec(255, 255, 255)]
       ]),
       expectOutput
     });
@@ -256,7 +257,8 @@ module.exports = (getTestImg) => {
       getOptionalArgsMap: () => ([
         ['size', size],
         ['flags', cv.INTER_CUBIC],
-        ['borderMode', cv.BORDER_REFLECT]
+        ['borderMode', cv.BORDER_CONSTANT],
+        ['borderValue', new cv.Vec(255, 255, 255)]
       ]),
       expectOutput
     });
@@ -1495,7 +1497,7 @@ module.exports = (getTestImg) => {
           20, 0.04, 1
         ]),
         getOptionalArgsMap: () => ([
-          ['mask', new cv.Mat(512,512,cv.CV_U8)],
+          ['mask', new cv.Mat(512, 512, cv.CV_U8)],
           ['blockSize', 3],
           ['gradientSize', 3],
           ['useHarrisDetector', false],
@@ -1520,7 +1522,7 @@ module.exports = (getTestImg) => {
           ['mask', new cv.Mat(512, 512, cv.CV_U8)],
           ['blockSize', 3],
           ['useHarrisDetector', false],
-          ['harrisK', 0.04 ]
+          ['harrisK', 0.04]
         ]),
         expectOutput: (out) => {
           expect(out).to.be.instanceOf(Array);