Stripped library

Author: Simon Hofmann

binding.gyp

@@ -22,8 +22,6 @@
 			"cc/ExternalMemTracking.cc",
 			"cc/cvTypes/cvTypes.cc",
 			"cc/cvTypes/imgprocConstants.cc",
-			"cc/cvTypes/photoConstants.cc",
-			"cc/cvTypes/videoCaptureProps.cc",
 			"cc/core/core.cc",
 			"cc/core/Mat.cc",
 			"cc/core/MatImgproc.cc",

cc/core/MatBindings.h

@@ -135,7 +135,7 @@ namespace MatBindings {
     std::string executeCatchCvExceptionWorker() {
       size = mat.rows * mat.cols * mat.elemSize();
       mat.locateROI(sizeTotal, ofs);
-      
+
       if(sizeTotal.width != mat.cols || sizeTotal.height != mat.rows){
         return "Cannot call GetData when Region of Interest is defined (i.e. after getRegion) use matrix.copyTo to copy ROI to a new matrix";
       }
@@ -934,7 +934,7 @@ namespace MatBindings {
 			);
 	  }
   };
-  
+
   struct EigenWorker : public CatchCvExceptionWorker {
   public:
 	  cv::Mat self;
@@ -953,18 +953,18 @@ namespace MatBindings {
 		  return Mat::Converter::wrap(eigenvalues);
 	  }
   };
-  
+
   struct SolveWorker : public CatchCvExceptionWorker {
   public:
 	  cv::Mat self;
 	  SolveWorker(cv::Mat self) {
 		  this->self = self;
 	  }
-    
+
 	  cv::Mat mat2;
 	  cv::Mat dst;
     int flags = 0; // cv.DECOMP_LU
-    
+
 	  std::string executeCatchCvExceptionWorker() {
 			cv::solve(self, mat2, dst, flags);
 		  return "";
@@ -973,20 +973,20 @@ namespace MatBindings {
 	  v8::Local<v8::Value> getReturnValue() {
 		  return Mat::Converter::wrap(dst);
 	  }
-    
+
     bool unwrapRequiredArgs(Nan::NAN_METHOD_ARGS_TYPE info) {
       return (
         Mat::Converter::arg(0, &mat2, info)
       );
     }
-    
+
     bool unwrapOptionalArgs(Nan::NAN_METHOD_ARGS_TYPE info) {
       return (
         IntConverter::optArg(1, &flags, info)
       );
-    }    
+    }
   };
-  
+
 #if CV_VERSION_MINOR > 1
   struct RotateWorker : public OpWithCodeWorker {
   public:
@@ -999,8 +999,5 @@ namespace MatBindings {
     }
   };
 #endif
-
-
 }
-
 #endif

cc/cvTypes/cvTypes.cc

@@ -1,16 +1,12 @@
 #include "cvTypes.h"
 #include "matTypes.h"
 #include "imgprocConstants.h"
-#include "photoConstants.h"
-#include "videoCaptureProps.h"
 
 using namespace cv;
 
 void CvTypes::Init(v8::Local<v8::Object> target) {
 	initMatTypes(target);
 	ImgprocConstants::Init(target);
-	PhotoConstants::Init(target);
-	VideoCaptureProps::Init(target);
 
 	FF_SET_CV_CONSTANT(target, NORM_INF);
 	FF_SET_CV_CONSTANT(target, NORM_L1);
@@ -85,39 +81,6 @@ void CvTypes::Init(v8::Local<v8::Object> target) {
 	FF_SET_JS_PROP(termCriteriaTypes, EPS, Nan::New<v8::Integer>(cv::TermCriteria::EPS));
 	target->Set(FF_NEW_STRING("termCriteria"), termCriteriaTypes);
 
-	v8::Local<v8::Object> svmConstants = Nan::New<v8::Object>();
-	FF_SET_JS_PROP(svmConstants, CUSTOM, Nan::New<v8::Integer>(ml::SVM::KernelTypes:: CUSTOM));
-	FF_SET_JS_PROP(svmConstants, LINEAR, Nan::New<v8::Integer>(ml::SVM::KernelTypes::LINEAR));
-	FF_SET_JS_PROP(svmConstants, POLY, Nan::New<v8::Integer>(ml::SVM::KernelTypes::POLY));
-	FF_SET_JS_PROP(svmConstants, RBF, Nan::New<v8::Integer>(ml::SVM::KernelTypes::RBF));
-	FF_SET_JS_PROP(svmConstants, SIGMOID, Nan::New<v8::Integer>(ml::SVM::KernelTypes::SIGMOID));
-	FF_SET_JS_PROP(svmConstants, CHI2, Nan::New<v8::Integer>(ml::SVM::KernelTypes::CHI2));
-	FF_SET_JS_PROP(svmConstants, INTER, Nan::New<v8::Integer>(ml::SVM::KernelTypes::INTER));
-
-	FF_SET_JS_PROP(svmConstants, C, Nan::New<v8::Integer>(ml::SVM::ParamTypes::C));
-	FF_SET_JS_PROP(svmConstants, COEF, Nan::New<v8::Integer>(ml::SVM::ParamTypes::COEF));
-	FF_SET_JS_PROP(svmConstants, DEGREE, Nan::New<v8::Integer>(ml::SVM::ParamTypes::DEGREE));
-	FF_SET_JS_PROP(svmConstants, GAMMA, Nan::New<v8::Integer>(ml::SVM::ParamTypes::GAMMA));
-	FF_SET_JS_PROP(svmConstants, NU, Nan::New<v8::Integer>(ml::SVM::ParamTypes::NU));
-	FF_SET_JS_PROP(svmConstants, P, Nan::New<v8::Integer>(ml::SVM::ParamTypes::P));
-
-	v8::Local<v8::Object> mlConstants = Nan::New<v8::Object>();
-	FF_SET_JS_PROP(mlConstants, COL_SAMPLE, Nan::New<v8::Integer>(ml::SampleTypes::COL_SAMPLE));
-	FF_SET_JS_PROP(mlConstants, ROW_SAMPLE, Nan::New<v8::Integer>(ml::SampleTypes::ROW_SAMPLE));
-
-	FF_SET_JS_PROP(mlConstants, VAR_CATEGORICAL, Nan::New<v8::Integer>(ml::VariableTypes::VAR_CATEGORICAL));
-	FF_SET_JS_PROP(mlConstants, VAR_NUMERICAL, Nan::New<v8::Integer>(ml::VariableTypes::VAR_NUMERICAL));
-	FF_SET_JS_PROP(mlConstants, VAR_ORDERED, Nan::New<v8::Integer>(ml::VariableTypes::VAR_ORDERED));
-	mlConstants->Set(FF_NEW_STRING("SVM"), svmConstants);
-	target->Set(FF_NEW_STRING("ml"), mlConstants);
-
-	v8::Local<v8::Object> statModelCostants = Nan::New<v8::Object>();
-	FF_SET_JS_PROP(statModelCostants, COMPRESSED_INPUT, Nan::New<v8::Integer>(ml::StatModel::Flags::COMPRESSED_INPUT));
-	FF_SET_JS_PROP(statModelCostants, PREPROCESSED_INPUT, Nan::New<v8::Integer>(ml::StatModel::Flags::PREPROCESSED_INPUT));
-	FF_SET_JS_PROP(statModelCostants, RAW_OUTPUT, Nan::New<v8::Integer>(ml::StatModel::Flags::RAW_OUTPUT));
-	FF_SET_JS_PROP(statModelCostants, UPDATE_MODEL, Nan::New<v8::Integer>(ml::StatModel::Flags::UPDATE_MODEL));
-	target->Set(FF_NEW_STRING("statModel"), statModelCostants);
-
 	v8::Local<v8::Object> haarCascades = Nan::New<v8::Object>();
 	FF_SET_CONST_WITH_VALUE(haarCascades, HAAR_EYE, FF_NEW_STRING("./haarcascade_eye.xml"));
 	FF_SET_CONST_WITH_VALUE(haarCascades, HAAR_EYE_TREE_EYEGLASSES, FF_NEW_STRING("./haarcascade_eye_tree_eyeglasses.xml"));
@@ -146,64 +109,10 @@ void CvTypes::Init(v8::Local<v8::Object> target) {
 	FF_SET_CONST_WITH_VALUE(lbpCascades, LBP_SILVERWARE, FF_NEW_STRING("./lbpcascade_silverware.xml"));
 	target->Set(FF_NEW_STRING("lbpCascades"), lbpCascades);
 
-	FF_SET_JS_PROP(target, REGULAR, Nan::New<v8::Integer>(0));
-	FF_SET_CV_CONSTANT(target, LMEDS);
-	FF_SET_CV_CONSTANT(target, RANSAC);
-	FF_SET_CV_CONSTANT(target, RHO);
-
-	FF_SET_CV_CONSTANT(target, SOLVEPNP_ITERATIVE);
-	FF_SET_CV_CONSTANT(target, SOLVEPNP_EPNP);
-	FF_SET_CV_CONSTANT(target, SOLVEPNP_P3P);
-	FF_SET_CV_CONSTANT(target, SOLVEPNP_DLS);
-	FF_SET_CV_CONSTANT(target, SOLVEPNP_UPNP);
-
-	FF_SET_CV_CONSTANT(target, CALIB_CB_ADAPTIVE_THRESH);
-	FF_SET_CV_CONSTANT(target, CALIB_CB_NORMALIZE_IMAGE);
-	FF_SET_CV_CONSTANT(target, CALIB_CB_FILTER_QUADS);
-	FF_SET_CV_CONSTANT(target, CALIB_CB_FAST_CHECK);
-
-	FF_SET_CV_CONSTANT(target, CALIB_CB_SYMMETRIC_GRID);
-	FF_SET_CV_CONSTANT(target, CALIB_CB_ASYMMETRIC_GRID);
-	FF_SET_CV_CONSTANT(target, CALIB_CB_CLUSTERING);
-
-	FF_SET_CV_CONSTANT(target, CALIB_USE_INTRINSIC_GUESS);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_ASPECT_RATIO);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_PRINCIPAL_POINT);
-	FF_SET_CV_CONSTANT(target, CALIB_ZERO_TANGENT_DIST);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_FOCAL_LENGTH);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_K1);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_K2);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_K3);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_K4);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_K5);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_K6);
-	FF_SET_CV_CONSTANT(target, CALIB_RATIONAL_MODEL);
-	FF_SET_CV_CONSTANT(target, CALIB_THIN_PRISM_MODEL);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_S1_S2_S3_S4);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_INTRINSIC);
-	FF_SET_CV_CONSTANT(target, CALIB_SAME_FOCAL_LENGTH);
-	FF_SET_CV_CONSTANT(target, CALIB_ZERO_DISPARITY);
 	FF_SET_CV_CONSTANT(target, REDUCE_SUM);
 	FF_SET_CV_CONSTANT(target, REDUCE_AVG);
 	FF_SET_CV_CONSTANT(target, REDUCE_MAX);
 	FF_SET_CV_CONSTANT(target, REDUCE_MIN);
-#if CV_VERSION_MINOR > 0
-	FF_SET_CV_CONSTANT(target, CALIB_TILTED_MODEL);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_TAUX_TAUY);
-	FF_SET_CV_CONSTANT(target, CALIB_USE_LU);
-#endif
-#if CV_VERSION_MINOR > 1
-	FF_SET_CV_CONSTANT(target, CALIB_USE_QR);
-#endif
-#if CV_VERSION_MINOR > 2
-	FF_SET_CV_CONSTANT(target, SOLVEPNP_AP3P);
-	FF_SET_CV_CONSTANT(target, SOLVEPNP_MAX_COUNT);
-	FF_SET_CV_CONSTANT(target, CALIB_FIX_TANGENT_DIST);
-#endif
-	FF_SET_CV_CONSTANT(target, FM_7POINT);
-	FF_SET_CV_CONSTANT(target, FM_8POINT);
-	FF_SET_CV_CONSTANT(target, FM_LMEDS);
-	FF_SET_CV_CONSTANT(target, FM_RANSAC);
 #if CV_VERSION_MINOR > 1
 	FF_SET_CV_CONSTANT(target, ROTATE_90_CLOCKWISE);
 	FF_SET_CV_CONSTANT(target, ROTATE_180);
@@ -223,7 +132,7 @@ void CvTypes::Init(v8::Local<v8::Object> target) {
 	FF_SET_CV_CONSTANT(target, COLORMAP_PINK);
 	FF_SET_CV_CONSTANT(target, COLORMAP_HOT);
 	FF_SET_CV_CONSTANT(target, COLORMAP_PARULA);
-	
+
 	FF_SET_CV_CONSTANT(target, DECOMP_LU);
 	FF_SET_CV_CONSTANT(target, DECOMP_CHOLESKY);
 	FF_SET_CV_CONSTANT(target, DECOMP_EIG);

cc/cvTypes/cvTypes.h

@@ -1,7 +1,6 @@
 #include "macros.h"
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/calib3d.hpp>
 
 
 #ifndef __FF_CVTYPES_H__
@@ -15,4 +14,4 @@ class CvTypes {
   static void Init(v8::Local<v8::Object> module);
 };
 
-#endif
+#endif

cc/cvTypes/imgprocConstants.h

@@ -1,7 +1,6 @@
 #include "macros.h"
 #include <opencv2/core.hpp>
 #include <opencv2/imgproc.hpp>
-#include <opencv2/ml.hpp>
 
 #ifndef __FF_IMGPROCCONSTANTS_H__
 #define __FF_IMGPROCCONSTANTS_H__
@@ -11,4 +10,4 @@ class ImgprocConstants {
   static void Init(v8::Local<v8::Object> module);
 };
 
-#endif
+#endif

cc/cvTypes/photoConstants.cc

@@ -1,6 +1,12 @@
 const opencvBuild = require(`@nut-tree/opencv-build-${process.platform}`);
 const { resolvePath, getLibDir, linkSystemLibs } = require('./commons');
 
+const desiredModules = [
+  "core",
+  "imgcodecs",
+  "imgproc"
+];
+
 function linkLibs(libs) {
   libs
     .map(lib => lib.libPath)
@@ -21,5 +27,5 @@ if (process.platform === 'win32') {
 
 // if not windows, link libs dynamically
 console.log('-L' + resolvePath(opencvBuild.opencvLibDir));
-opencvBuild.opencvModules.forEach(lib => console.log(`-lopencv_${lib}`));
+opencvBuild.opencvModules.filter(lib => desiredModules.includes(lib)).forEach(lib => console.log(`-lopencv_${lib}`));
 console.log('-Wl,-rpath,' + resolvePath(opencvBuild.opencvLibDir));