cleanup - use new includes only if CV major version code is >= 3.

src/Calib3D.h

@@ -3,7 +3,9 @@
 
 #include "OpenCV.h"
 
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/calib3d.hpp>
+#endif
 
 // Implementation of calib3d.hpp functions
 

src/CamShift.cc

@@ -2,7 +2,9 @@
 #include "OpenCV.h"
 #include "Matrix.h"
 
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/video/tracking.hpp>
+#endif
 
 #define CHANNEL_HUE 0
 #define CHANNEL_SATURATION 1

src/CascadeClassifierWrap.cc

@@ -3,11 +3,11 @@
 #include "Matrix.h"
 #include <nan.h>
 
-
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/objdetect.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/imgcodecs.hpp>
-
+#endif
 
 Persistent<FunctionTemplate> CascadeClassifierWrap::constructor;
 

src/CascadeClassifierWrap.h

@@ -1,5 +1,8 @@
 #include "OpenCV.h"
+
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/objdetect.hpp>
+#endif
 
 class CascadeClassifierWrap: public node::ObjectWrap {
   public: 

src/Contours.cc

@@ -4,7 +4,6 @@
 
 #include <iostream>
 
-#include <opencv2/imgproc.hpp>
 
 v8::Persistent<FunctionTemplate> Contour::constructor;
 

src/Matrix.cc

@@ -3,10 +3,10 @@
 #include "OpenCV.h"
 #include <nan.h>
 
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/imgcodecs.hpp>
 #include <opencv2/ml.hpp>
+#endif
 
 v8::Persistent<FunctionTemplate> Matrix::constructor;
 

src/OpenCV.cc

@@ -2,9 +2,10 @@
 #include "Matrix.h"
 #include <nan.h>
 
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
+
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/imgcodecs.hpp>
+#endif
 
 void
 OpenCV::Init(Handle<Object> target) {

src/OpenCV.h

@@ -7,9 +7,11 @@
 #include <node_version.h>
 #include <node_buffer.h>
 #include <opencv/cv.h>
+#if CV_MAJOR_VERSION >= 3
 #include <opencv2/highgui.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/videoio.hpp>
+#endif
 #include <string.h>
 #include <nan.h>
 

src/Stereo.cc

@@ -1,8 +1,12 @@
 #include "Stereo.h"
 #include "Matrix.h"
-//#include <opencv2/legacy.hpp>
-#include <opencv2/ml.hpp>
+#if CV_MAJOR_VERSION < 3
+#include <opencv2/legacy.hpp>
+#endif
 
+#if CV_MAJOR_VERSION >= 3
+#include <opencv2/ml.hpp>
+#endif
 // Block matching
 
 v8::Persistent<FunctionTemplate> StereoBM::constructor;
@@ -17,11 +21,11 @@ StereoBM::Init(Handle<Object> target) {
     ctor->SetClassName(NanNew("StereoBM"));
 
     NODE_SET_PROTOTYPE_METHOD(ctor, "compute", Compute);
-
-    ctor->Set(NanNew<String>("BASIC_PRESET"), NanNew<Integer>((int)0));
-    ctor->Set(NanNew<String>("FISH_EYE_PRESET"), NanNew<Integer>((int)1));
-    ctor->Set(NanNew<String>("NARROW_PRESET"), NanNew<Integer>((int)2));
-
+#if CV_MAJOR_VERSION < 3
+    ctor->Set(NanNew<String>("BASIC_PRESET"), NanNew<Integer>((int)cv::StereoBM::BASIC_PRESET));
+    ctor->Set(NanNew<String>("FISH_EYE_PRESET"), NanNew<Integer>((int)cv::StereoBM::FISH_EYE_PRESET));
+    ctor->Set(NanNew<String>("NARROW_PRESET"), NanNew<Integer>((int)cv::StereoBM::NARROW_PRESET));
+#endif
     target->Set(NanNew("StereoBM"), ctor->GetFunction());
 }
 
@@ -229,7 +233,7 @@ NAN_METHOD(StereoSGBM::Compute)
     }
 
 };
-#if 0
+#if CV_VERSION_MAJOR < 3
 // Graph cut
 
 v8::Persistent<FunctionTemplate> StereoGC::constructor;

src/Stereo.h

@@ -40,7 +40,9 @@ public:
 
     JSFUNC(Compute);
 };
-#if 0
+
+#if CV_VERSION_MAJOR < 3
+
 struct CvStereoGCState;
 
 class StereoGC: public node::ObjectWrap {

src/init.cc

@@ -31,8 +31,9 @@ init(Handle<Object> target) {
     ImgProc::Init(target);
     StereoBM::Init(target);
     StereoSGBM::Init(target);
-    //StereoGC::Init(target);
-
+#if CV_MAJOR_VERSION < 3
+    StereoGC::Init(target);
+#endif
 
    #if CV_MAJOR_VERSION >= 2 && CV_MINOR_VERSION >=4
       Features::Init(target);