fixed gcc error + gcc warnings

changgeee · Jun 1, 2019 · 15aec23 · 15aec23
1 parent 3e9e4c6
commit 15aec23
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -10,4 +10,5 @@ ci/coverage-report
 !data/Lenna.png
 !data/people.jpeg
 !data/traffic.mp4
-!data/text-models
+!data/text-models
+!native-node-utils
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ data/dnn
 .idea/
 dist
 .DS_Store
+native-node-utils
diff --git a/.npmignore b/.npmignore
@@ -15,4 +15,5 @@ coverage-report
 tmpdata
 ci
 .dockerignore
-dist
+dist
+native-node-utils
diff --git a/cc/core/Mat.cc b/cc/core/Mat.cc
@@ -379,10 +379,10 @@ NAN_METHOD(Mat::Norm) {
 
   FF::TryCatch tryCatch;
   if (
-	  hasOptArgsObj && (
+	  (hasOptArgsObj && (
 		FF::UintConverter::optProp(&normType, "normType", optArgs) ||
 		Mat::Converter::optProp(&mask, "mask", optArgs)
-		) || (
+		)) || (
 		FF::UintConverter::optArg(i, &normType, info) ||
 		Mat::Converter::optArg(i + 1, &mask, info)
 		)
@@ -460,8 +460,7 @@ NAN_METHOD(Mat::Row) {
 
 NAN_METHOD(Mat::Release) {
     // must get pointer to the original; else we are just getting a COPY and then releasing that!
-    cv::Mat *mat = &(Mat::unwrapSelf(info));
-    mat->release();
+    Mat::unwrapThis(info)->self.release();
 }
 
 NAN_METHOD(Mat::PushBack) {

diff --git a/cc/core/core.cc b/cc/core/core.cc
@@ -139,8 +139,8 @@ NAN_METHOD(Core::Kmeans) {
   cv::TermCriteria termCriteria;
   int k, attempts, flags;
   if ((
-	  isPoint2 && Point2::ArrayWithCastConverter<cv::Point2f>::arg(0, &pts2d, info) ||
-	  !isPoint2 && Point3::ArrayWithCastConverter<cv::Point3f>::arg(0, &pts3d, info)
+	  (isPoint2 && Point2::ArrayWithCastConverter<cv::Point2f>::arg(0, &pts2d, info)) ||
+	  (!isPoint2 && Point3::ArrayWithCastConverter<cv::Point3f>::arg(0, &pts3d, info))
 	  ) ||
 	  FF::IntConverter::arg(1, &k, info) ||
 	  TermCriteria::Converter::arg(2, &termCriteria, info) ||

diff --git a/cc/macros.h b/cc/macros.h
@@ -41,7 +41,7 @@
 		FF::TryCatch tryCatch; \
 		ff_type val; \
 		if (ff_converter::unwrapTo(&val, value)) { \
-			tryCatch.throwNew(tryCatch.formatCatchedError(#name)); \
+			return tryCatch.throwNew(tryCatch.formatCatchedError(#name)); \
 		} \
 		Nan::ObjectWrap::Unwrap<clazz>(info.This())->prop = val; \
 	}

diff --git a/cc/modules/imgproc/imgproc.cc b/cc/modules/imgproc/imgproc.cc
@@ -214,11 +214,11 @@ NAN_METHOD(Imgproc::Plot1DHist) {
 		Mat::Converter::arg(1, &plot, info) ||
 		Vec3::Converter::arg(2, &color, info) ||
 		(
-			FF::isArgObject(info, 3) && (
+			(FF::isArgObject(info, 3) && (
 				FF::IntConverter::optProp(&lineType, "lineType", opts) ||
 				FF::IntConverter::optProp(&thickness, "thickness", opts) ||
 				FF::IntConverter::optProp(&shift, "shift", opts)
-			) || (
+			)) || (
 				FF::IntConverter::optArg(3, &lineType, info) ||
 				FF::IntConverter::optArg(4, &thickness, info) ||
 				FF::IntConverter::optArg(5, &shift, info)
@@ -286,8 +286,8 @@ NAN_METHOD(Imgproc::FitLine) {
   uint distType;
   double param, reps, aeps;
   if ((
-	isPoint2 && Point2::ArrayConverter::arg(0, &pts2d, info) ||
-	!isPoint2 && Point3::ArrayConverter::arg(0, &pts3d, info)
+	(isPoint2 && Point2::ArrayConverter::arg(0, &pts2d, info)) ||
+	(!isPoint2 && Point3::ArrayConverter::arg(0, &pts3d, info))
 	) ||
 	FF::UintConverter::arg(1, &distType, info) ||
 	FF::DoubleConverter::arg(2, &param, info) ||

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
   "gypfile": true,
   "dependencies": {
     "nan": "^2.13.2",
-    "native-node-utils": "^0.2.0",
+    "native-node-utils": "^0.2.1",
     "opencv-build": "^0.1.3"
   },
   "optionalDependencies": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ data/dnn @@
     .idea/
     dist
     .DS_Store
+    native-node-utils