[dartcv] adapt for native-assets

Author: rainyl

Diff for: .fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "stable"
+  "flutter": "master"
 }

Diff for: packages/dartcv/README.md

@@ -6,6 +6,10 @@ OpenCV bindings for Dart language.
 use [opencv_core](https://pub.dev/packages/opencv_core) (if `videoio` module is NOT required)
 or [opencv_dart](https://pub.dev/packages/opencv_dart) (if `videoio` module IS required).
 
+> [!IMPORTANT]
+>
+> `v2.x` is prepared for `Native Assets`. Use only if you know what you are doing.
+
 ## Install
 
 - `dart pub add dartcv4` or Add dartcv4 to `pubspec.yaml`

Diff for: packages/dartcv/analysis_options.yaml

@@ -39,7 +39,7 @@ analyzer:
     non_constant_identifier_names: ignore
     parameter_assignments: error
 formatter:
-  pagewidth: 110
+  page_width: 110
 
 linter:
   rules:
@@ -217,7 +217,6 @@ linter:
     - unnecessary_this
     - unnecessary_to_list_in_spreads
     - unrelated_type_equality_checks
-    - unsafe_html
     - use_build_context_synchronously
     - use_colored_box
     - use_decorated_box

Diff for: packages/dartcv/ffigen/ffigen_calib3d.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/calib3d.yaml'
     import-path: 'package:dartcv4/src/g/calib3d.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/calib3d/calib3d.h
+    - ../src/calib3d/calib3d.h
   include-directives:
-    - ../src/dartcv/calib3d/calib3d.h
+    - ../src/calib3d/calib3d.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_const.yaml

@@ -3,16 +3,16 @@ description: |
   Constants for color conversion
 output:
   bindings: ../lib/src/g/constants.g.dart
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 compiler-opts: ""
 sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/core/constants.h
+    - ../src/core/constants.h
   include-directives:
-    - ../src/dartcv/core/constants.h
+    - ../src/core/constants.h
 
 preamble: |
   // coverage:ignore-file

Diff for: packages/dartcv/ffigen/ffigen_contrib.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: "package:dartcv4/src/g/contrib.yaml"
     import-path: "package:dartcv4/src/g/contrib.g.dart"
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - "package:dartcv4/src/g/types.yaml"
@@ -16,19 +16,19 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/contrib/aruco.h
-    - ../src/dartcv/contrib/img_hash.h
-    - ../src/dartcv/contrib/quality.h
-    - ../src/dartcv/contrib/wechat_qrcode.h
-    - ../src/dartcv/contrib/ximgproc.h
-    - ../src/dartcv/contrib/xobjdetect.h
+    - ../src/contrib/aruco.h
+    - ../src/contrib/img_hash.h
+    - ../src/contrib/quality.h
+    - ../src/contrib/wechat_qrcode.h
+    - ../src/contrib/ximgproc.h
+    - ../src/contrib/xobjdetect.h
   include-directives:
-    - ../src/dartcv/contrib/aruco.h
-    - ../src/dartcv/contrib/img_hash.h
-    - ../src/dartcv/contrib/quality.h
-    - ../src/dartcv/contrib/wechat_qrcode.h
-    - ../src/dartcv/contrib/ximgproc.h
-    - ../src/dartcv/contrib/xobjdetect.h
+    - ../src/contrib/aruco.h
+    - ../src/contrib/img_hash.h
+    - ../src/contrib/quality.h
+    - ../src/contrib/wechat_qrcode.h
+    - ../src/contrib/ximgproc.h
+    - ../src/contrib/xobjdetect.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_core.yaml

@@ -9,30 +9,30 @@ output:
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 compiler-opts: "-Isrc -Idartcv"
 sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/core/core.h
-    - ../src/dartcv/core/exception.h
-    - ../src/dartcv/core/logging.h
-    - ../src/dartcv/core/mat.h
-    - ../src/dartcv/core/svd.h
-    - ../src/dartcv/core/stdvec.h
-    - ../src/dartcv/core/utils.h
-    - ../src/dartcv/core/version.h
+    - ../src/core/core.h
+    - ../src/core/exception.h
+    - ../src/core/logging.h
+    - ../src/core/mat.h
+    - ../src/core/svd.h
+    - ../src/core/stdvec.h
+    - ../src/core/utils.h
+    - ../src/core/version.h
   include-directives:
-    - ../src/dartcv/core/core.h
-    - ../src/dartcv/core/exception.h
-    - ../src/dartcv/core/logging.h
-    - ../src/dartcv/core/mat.h
-    - ../src/dartcv/core/svd.h
-    - ../src/dartcv/core/stdvec.h
-    - ../src/dartcv/core/utils.h
-    - ../src/dartcv/core/version.h
+    - ../src/core/core.h
+    - ../src/core/exception.h
+    - ../src/core/logging.h
+    - ../src/core/mat.h
+    - ../src/core/svd.h
+    - ../src/core/stdvec.h
+    - ../src/core/utils.h
+    - ../src/core/version.h
 functions:
   leaf:
     include:

Diff for: packages/dartcv/ffigen/ffigen_dnn.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/dnn.yaml'
     import-path: 'package:dartcv4/src/g/dnn.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/dnn/dnn.h
+    - ../src/dnn/dnn.h
   include-directives:
-    - ../src/dartcv/dnn/dnn.h
+    - ../src/dnn/dnn.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_features2d.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/features2d.yaml'
     import-path: 'package:dartcv4/src/g/features2d.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/features2d/features2d.h
+    - ../src/features2d/features2d.h
   include-directives:
-    - ../src/dartcv/features2d/features2d.h
+    - ../src/features2d/features2d.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_gapi.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/gapi.yaml'
     import-path: 'package:dartcv4/src/g/gapi.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/gapi/gapi.h
+    - ../src/gapi/gapi.h
   include-directives:
-    - ../src/dartcv/gapi/gapi.h
+    - ../src/gapi/gapi.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_highgui.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/highgui.yaml'
     import-path: 'package:dartcv4/src/g/highgui.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/highgui/highgui.h
+    - ../src/highgui/highgui.h
   include-directives:
-    - ../src/dartcv/highgui/highgui.h
+    - ../src/highgui/highgui.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_imgcodecs.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/imgcodecs.yaml'
     import-path: 'package:dartcv4/src/g/imgcodecs.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/imgcodecs/imgcodecs.h
+    - ../src/imgcodecs/imgcodecs.h
   include-directives:
-    - ../src/dartcv/imgcodecs/imgcodecs.h
+    - ../src/imgcodecs/imgcodecs.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_imgproc.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/imgproc.yaml'
     import-path: 'package:dartcv4/src/g/imgproc.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/imgproc/imgproc.h
+    - ../src/imgproc/imgproc.h
   include-directives:
-    - ../src/dartcv/imgproc/imgproc.h
+    - ../src/imgproc/imgproc.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_objdetect.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/objdetect.yaml'
     import-path: 'package:dartcv4/src/g/objdetect.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/objdetect/objdetect.h
+    - ../src/objdetect/objdetect.h
   include-directives:
-    - ../src/dartcv/objdetect/objdetect.h
+    - ../src/objdetect/objdetect.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_photo.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/photo.yaml'
     import-path: 'package:dartcv4/src/g/photo.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/photo/photo.h
+    - ../src/photo/photo.h
   include-directives:
-    - ../src/dartcv/photo/photo.h
+    - ../src/photo/photo.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_stitching.yaml

@@ -6,8 +6,8 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/stitching.yaml'
     import-path: 'package:dartcv4/src/g/stitching.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 import:
   symbol-files:
     - 'package:dartcv4/src/g/types.yaml'
@@ -16,9 +16,9 @@ sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/stitching/stitching.h
+    - ../src/stitching/stitching.h
   include-directives:
-    - ../src/dartcv/stitching/stitching.h
+    - ../src/stitching/stitching.h
 
 functions:
   symbol-address:

Diff for: packages/dartcv/ffigen/ffigen_types.yaml

@@ -6,16 +6,16 @@ output:
   symbol-file:
     output: 'package:dartcv4/src/g/types.yaml'
     import-path: 'package:dartcv4/src/g/types.g.dart'
-# ffi-native:
-#   assetId: 'package:dartcv4/dartcv.dart' # Optional.
+ffi-native:
+  asset-id: 'package:dartcv4/dartcv.dart' # Optional.
 compiler-opts: "-Isrc -Idartcv"
 sort: true
 include-unused-typedefs: true
 headers:
   entry-points:
-    - ../src/dartcv/core/types.h
+    - ../src/core/types.h
   include-directives:
-    - ../src/dartcv/core/types.h
+    - ../src/core/types.h
 
 functions:
   symbol-address: