cc: fix compatibility issues

Author: oyyd

cc/modules/dnn/NetBindings.h

@@ -68,10 +68,11 @@ namespace NetBindings {
     }
 
     bool unwrapOptionalArgs(Nan::NAN_METHOD_ARGS_TYPE info) {
+#if CV_VERSION_MINOR > 2
       if (FF_IS_ARRAY(info[0])) {
         return StringArrayConverter::optArg(0, &outBlobNames, info);
       }
-
+#endif
       return (
         StringConverter::optArg(0, &outputName, info)
       );

cc/modules/dnn/dnn.cc

@@ -19,7 +19,9 @@ NAN_MODULE_INIT(Dnn::Init) {
   Nan::SetMethod(target, "blobFromImageAsync", BlobFromImageAsync);
   Nan::SetMethod(target, "blobFromImages", BlobFromImages);
   Nan::SetMethod(target, "blobFromImagesAsync", BlobFromImagesAsync);
+#if CV_VERSION_MINOR > 3
   Nan::SetMethod(target, "NMSBoxes", NMSBoxes);
+#endif
 };
 
 NAN_METHOD(Dnn::ReadNetFromTensorflow) {
@@ -86,12 +88,14 @@ NAN_METHOD(Dnn::BlobFromImagesAsync) {
   );
 }
 
+#if CV_VERSION_MINOR > 3
 NAN_METHOD(Dnn::NMSBoxes) {
   FF::SyncBinding(
     std::make_shared<DnnBindings::NMSBoxes>(),
     "NMSBoxes",
     info
   );
 }
+#endif
 
 #endif

cc/modules/dnn/dnn.h

@@ -11,15 +11,17 @@ class Dnn {
 public:
   static NAN_MODULE_INIT(Init);
 
-	static NAN_METHOD(ReadNetFromTensorflow);
-	static NAN_METHOD(ReadNetFromTensorflowAsync);
-	static NAN_METHOD(ReadNetFromCaffe);
-	static NAN_METHOD(ReadNetFromCaffeAsync);
-	static NAN_METHOD(BlobFromImage);
-	static NAN_METHOD(BlobFromImageAsync);
-	static NAN_METHOD(BlobFromImages);
-	static NAN_METHOD(BlobFromImagesAsync);
+  static NAN_METHOD(ReadNetFromTensorflow);
+  static NAN_METHOD(ReadNetFromTensorflowAsync);
+  static NAN_METHOD(ReadNetFromCaffe);
+  static NAN_METHOD(ReadNetFromCaffeAsync);
+  static NAN_METHOD(BlobFromImage);
+  static NAN_METHOD(BlobFromImageAsync);
+  static NAN_METHOD(BlobFromImages);
+  static NAN_METHOD(BlobFromImagesAsync);
+#if CV_VERSION_MINOR > 3
   static NAN_METHOD(NMSBoxes);
+#endif
 };
 
 #endif

cc/modules/dnn/dnnBindings.h

@@ -81,12 +81,21 @@ namespace DnnBindings {
     cv::Mat returnValue;
 
     std::string executeCatchCvExceptionWorker() {
+#if CV_VERSION_MINOR > 3 && CV_VERSION_REVISION > 2
       if (isSingleImage) {
         returnValue = cv::dnn::blobFromImage(image, scalefactor, size, mean, swapRB, crop, ddepth);
       }
       else {
         returnValue = cv::dnn::blobFromImages(images, scalefactor, size, mean, swapRB, crop, ddepth);
       }
+#else
+      if (isSingleImage) {
+        returnValue = cv::dnn::blobFromImage(image, scalefactor, size, mean, swapRB, crop);
+      }
+      else {
+        returnValue = cv::dnn::blobFromImages(images, scalefactor, size, mean, swapRB, crop);
+      }
+#endif
       return "";
     }
 
@@ -129,6 +138,7 @@ namespace DnnBindings {
     }
   };
 
+#if CV_VERSION_MINOR > 3
   struct NMSBoxes : public CatchCvExceptionWorker {
   public:
     std::vector<cv::Rect> bboxes;
@@ -156,6 +166,7 @@ namespace DnnBindings {
       );
     }
   };
+#endif
 }
 
 #endif

test/tests/modules/dnn/dnn.test.js

@@ -83,21 +83,23 @@ describe('dnn', () => {
     });
   });
 
-  describe('NMSBoxes', () => {
-    generateAPITests({
-      getDut: () => cv,
-      methodName: 'NMSBoxes',
-      hasAsync: false,
-      getRequiredArgs: () => ([
-        [new cv.Rect(0, 0, 1, 1)],
-        [1],
-        0.5,
-        0.4,
-      ]),
-      expectOutput: (res) => {
-        expect(res).to.be.instanceOf(Array);
-        expect(res[0]).to.be.equal(0);
-      },
+  if (cv.version.minor > 3) {
+    describe('NMSBoxes', () => {
+      generateAPITests({
+        getDut: () => cv,
+        methodName: 'NMSBoxes',
+        hasAsync: false,
+        getRequiredArgs: () => ([
+          [new cv.Rect(0, 0, 1, 1)],
+          [1],
+          0.5,
+          0.4,
+        ]),
+        expectOutput: (res) => {
+          expect(res).to.be.instanceOf(Array);
+          expect(res[0]).to.be.equal(0);
+        },
+      });
     });
-  });
+  }
 });