Merge pull request #300 from abdelaziz-mahdy/fix-make-file

make file auto clone
rainyl · Nov 28, 2024 · 618d4c3 · 618d4c3
2 parents 0f1f788 + bc98fd4
commit 618d4c3
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 8 deletions.
diff --git a/packages/dartcv/Makefile b/packages/dartcv/Makefile
@@ -1,6 +1,7 @@
-.PHONY: ffigen ffigen_test
+.PHONY: ffigen ffigen_test clone_repo clean_repo
 
-ffigen:
+
+ffigen: clone_repo
 	dart run ffigen --config ffigen/ffigen_const.yaml
 	dart run ffigen --config ffigen/ffigen_types.yaml
 	dart run ffigen --config ffigen/ffigen_core.yaml
@@ -18,6 +19,14 @@ ffigen:
 	dart run ffigen --config ffigen/ffigen_video.yaml
 	dart run ffigen --config ffigen/ffigen_videoio.yaml
 
-ffigen_test:
+
+clone_repo:
+	echo "Getting submodules"
+	@git submodule update --init --recursive
+
+	echo "Updating submodules"
+	@git submodule update --remote
+
+ffigen_test: clone_repo
 	dart run ffigen --config ffigen/ffigen_types.yaml
 	dart run ffigen --config ffigen/ffigen_core.yaml
diff --git a/packages/dartcv/lib/src/g/core.yaml b/packages/dartcv/lib/src/g/core.yaml
@@ -628,12 +628,12 @@ files:
         name: registerErrorCallback
       c:@F@setLogLevel:
         name: setLogLevel
-      c:@T@double_t:
-        name: double_t
-      c:@T@float_t:
-        name: float_t
       c:exception.h@T@ErrorCallback:
         name: ErrorCallback
+      c:math.h@T@double_t:
+        name: double_t
+      c:math.h@T@float_t:
+        name: float_t
       c:types.h@T@CvPoint:
         name: CvPoint
       c:types.h@T@CvRect:

diff --git a/packages/dartcv/lib/src/g/imgproc.g.dart b/packages/dartcv/lib/src/g/imgproc.g.dart
@@ -2714,6 +2714,43 @@ class CvNativeImgproc {
       ffi.Pointer<CvStatus> Function(
           Mat, Mat, Mat, Mat, int, int, imp1.CvCallback_0)>();
 
+  ffi.Pointer<CvStatus> cv_intersectConvexConvex(
+    VecPoint p1,
+    VecPoint p2,
+    ffi.Pointer<VecPoint> p12,
+    bool handleNested,
+    ffi.Pointer<ffi.Float> rval,
+    imp1.CvCallback_0 callback,
+  ) {
+    return _cv_intersectConvexConvex(
+      p1,
+      p2,
+      p12,
+      handleNested,
+      rval,
+      callback,
+    );
+  }
+
+  late final _cv_intersectConvexConvexPtr = _lookup<
+      ffi.NativeFunction<
+          ffi.Pointer<CvStatus> Function(
+              VecPoint,
+              VecPoint,
+              ffi.Pointer<VecPoint>,
+              ffi.Bool,
+              ffi.Pointer<ffi.Float>,
+              imp1.CvCallback_0)>>('cv_intersectConvexConvex');
+  late final _cv_intersectConvexConvex =
+      _cv_intersectConvexConvexPtr.asFunction<
+          ffi.Pointer<CvStatus> Function(
+              VecPoint,
+              VecPoint,
+              ffi.Pointer<VecPoint>,
+              bool,
+              ffi.Pointer<ffi.Float>,
+              imp1.CvCallback_0)>();
+
   ffi.Pointer<CvStatus> cv_invertAffineTransform(
     Mat src,
     Mat dst,
@@ -2734,6 +2771,20 @@ class CvNativeImgproc {
       _cv_invertAffineTransformPtr.asFunction<
           ffi.Pointer<CvStatus> Function(Mat, Mat, imp1.CvCallback_0)>();
 
+  bool cv_isContourConvex(
+    VecPoint contour,
+  ) {
+    return _cv_isContourConvex(
+      contour,
+    );
+  }
+
+  late final _cv_isContourConvexPtr =
+      _lookup<ffi.NativeFunction<ffi.Bool Function(VecPoint)>>(
+          'cv_isContourConvex');
+  late final _cv_isContourConvex =
+      _cv_isContourConvexPtr.asFunction<bool Function(VecPoint)>();
+
   ffi.Pointer<CvStatus> cv_line(
     Mat img,
     CvPoint pt1,

diff --git a/packages/dartcv/lib/src/g/imgproc.yaml b/packages/dartcv/lib/src/g/imgproc.yaml
@@ -206,8 +206,12 @@ files:
         name: cv_grabCut
       c:@F@cv_integral:
         name: cv_integral
+      c:@F@cv_intersectConvexConvex:
+        name: cv_intersectConvexConvex
       c:@F@cv_invertAffineTransform:
         name: cv_invertAffineTransform
+      c:@F@cv_isContourConvex:
+        name: cv_isContourConvex
       c:@F@cv_line:
         name: cv_line
       c:@F@cv_linearPolar:

diff --git a/packages/dartcv/src b/packages/dartcv/src
+1 −1		CMakeLists.txt
+3 −3		DartCvIOS.podspec
+3 −3		DartCvMacOS.podspec
+2 −2		cmake/download_setup_opencv.cmake
+5 −5		cmake/ios.toolchain.cmake
+8 −4		dartcv/CMakeLists.txt
+16 −1		dartcv/imgproc/imgproc.cpp
+5 −1		dartcv/imgproc/imgproc.h
+2 −2		dartcv/videoio/videoio.cpp
+1 −1		dartcv/videoio/videoio.h