use VecPoint2f for findChessboardCorners drawChessboardCorners

Author: rainyl

packages/dartcv/lib/src/calib3d/calib3d.dart

@@ -184,19 +184,19 @@ Mat undistortPoints(
 //
 // For further details, please see:
 // https://docs.opencv.org/master/d9/d0c/group__calib3d.html#ga93efa9b0aa890de240ca32b11253dd4a
-(bool success, Mat corners) findChessboardCorners(
+(bool success, VecPoint2f corners) findChessboardCorners(
   InputArray image,
   (int, int) patternSize, {
-  OutputArray? corners,
+  VecPoint2f? corners,
   int flags = CALIB_CB_ADAPTIVE_THRESH + CALIB_CB_NORMALIZE_IMAGE,
 }) {
-  corners ??= Mat.empty();
+  corners ??= VecPoint2f();
   final r = calloc<ffi.Bool>();
   cvRun(
     () => ccalib3d.cv_findChessboardCorners(
       image.ref,
       patternSize.cvd.ref,
-      corners!.ref,
+      corners!.ptr,
       flags,
       r,
       ffi.nullptr,
@@ -267,7 +267,7 @@ Mat undistortPoints(
 Mat drawChessboardCorners(
   InputOutputArray image,
   (int, int) patternSize,
-  InputArray corners,
+  VecPoint2f corners,
   bool patternWasFound,
 ) {
   cvRun(

packages/dartcv/lib/src/calib3d/calib3d_async.dart

@@ -183,19 +183,19 @@ Future<Mat> undistortPointsAsync(
 //
 // For further details, please see:
 // https://docs.opencv.org/master/d9/d0c/group__calib3d.html#ga93efa9b0aa890de240ca32b11253dd4a
-Future<(bool success, Mat corners)> findChessboardCornersAsync(
+Future<(bool success, VecPoint2f corners)> findChessboardCornersAsync(
   InputArray image,
   (int, int) patternSize, {
-  OutputArray? corners,
+  VecPoint2f? corners,
   int flags = CALIB_CB_ADAPTIVE_THRESH + CALIB_CB_NORMALIZE_IMAGE,
 }) async {
-  corners ??= Mat.empty();
+  corners ??= VecPoint2f();
   final r = calloc<ffi.Bool>();
   return cvRunAsync0(
       (callback) => ccalib3d.cv_findChessboardCorners(
             image.ref,
             patternSize.cvd.ref,
-            corners!.ref,
+            corners!.ptr,
             flags,
             r,
             callback,
@@ -266,7 +266,7 @@ Future<(bool, VecPoint2f corners, Mat meta)> findChessboardCornersSBWithMetaAsyn
 Future<Mat> drawChessboardCornersAsync(
   InputOutputArray image,
   (int, int) patternSize,
-  InputArray corners,
+  VecPoint2f corners,
   bool patternWasFound,
 ) async {
   return cvRunAsync0(

packages/dartcv/lib/src/g/calib3d.g.dart

@@ -124,7 +124,7 @@ class CvNativeCalib3d {
   ffi.Pointer<CvStatus> cv_drawChessboardCorners(
     Mat image,
     CvSize patternSize,
-    Mat corners,
+    VecPoint2f corners,
     bool patternWasFound,
     imp1.CvCallback_0 callback,
   ) {
@@ -139,12 +139,12 @@ class CvNativeCalib3d {
 
   late final _cv_drawChessboardCornersPtr = _lookup<
       ffi.NativeFunction<
-          ffi.Pointer<CvStatus> Function(Mat, CvSize, Mat, ffi.Bool,
+          ffi.Pointer<CvStatus> Function(Mat, CvSize, VecPoint2f, ffi.Bool,
               imp1.CvCallback_0)>>('cv_drawChessboardCorners');
   late final _cv_drawChessboardCorners =
       _cv_drawChessboardCornersPtr.asFunction<
           ffi.Pointer<CvStatus> Function(
-              Mat, CvSize, Mat, bool, imp1.CvCallback_0)>();
+              Mat, CvSize, VecPoint2f, bool, imp1.CvCallback_0)>();
 
   ffi.Pointer<CvStatus> cv_estimateAffine2D(
     VecPoint2f from,
@@ -284,7 +284,7 @@ class CvNativeCalib3d {
   ffi.Pointer<CvStatus> cv_findChessboardCorners(
     Mat image,
     CvSize patternSize,
-    Mat corners,
+    ffi.Pointer<VecPoint2f> corners,
     int flags,
     ffi.Pointer<ffi.Bool> rval,
     imp1.CvCallback_0 callback,
@@ -304,14 +304,14 @@ class CvNativeCalib3d {
           ffi.Pointer<CvStatus> Function(
               Mat,
               CvSize,
-              Mat,
+              ffi.Pointer<VecPoint2f>,
               ffi.Int,
               ffi.Pointer<ffi.Bool>,
               imp1.CvCallback_0)>>('cv_findChessboardCorners');
   late final _cv_findChessboardCorners =
       _cv_findChessboardCornersPtr.asFunction<
-          ffi.Pointer<CvStatus> Function(Mat, CvSize, Mat, int,
-              ffi.Pointer<ffi.Bool>, imp1.CvCallback_0)>();
+          ffi.Pointer<CvStatus> Function(Mat, CvSize, ffi.Pointer<VecPoint2f>,
+              int, ffi.Pointer<ffi.Bool>, imp1.CvCallback_0)>();
 
   ffi.Pointer<CvStatus> cv_findChessboardCornersSB(
     Mat image,

packages/dartcv/test/calib3d_test.dart

@@ -232,11 +232,11 @@ void main() async {
   });
 
   test('cv.findChessboardCornersSB', () async {
-    final img = cv.imread("test/images/chessboard_4x6.png", flags: cv.IMREAD_UNCHANGED);
+    final img = cv.imread("test/images/chessboard_4x6.png", flags: cv.IMREAD_COLOR);
     expect(img.isEmpty, false);
 
     // {
-    final (found, corners) = cv.findChessboardCornersSB(img, (4, 6), flags: cv.CALIB_CB_EXHAUSTIVE | cv.CALIB_CB_ACCURACY);
+    final (found, corners) = cv.findChessboardCornersSB(img, (4, 6), flags: 0);
     expect(found, true);
     // expect(corners.isEmpty, false);
 
@@ -256,7 +256,7 @@ void main() async {
   });
 
   test('cv.findChessboardCornersSBWithMeta', () async {
-    final img = cv.imread("test/images/chessboard_4x6.png", flags: cv.IMREAD_UNCHANGED);
+    final img = cv.imread("test/images/chessboard_4x6.png", flags: cv.IMREAD_COLOR);
     expect(img.isEmpty, false);
 
     {
@@ -297,9 +297,7 @@ void main() async {
       }
     }
     final objectPointsVector = cv.Contours3f.fromList([pts]);
-    final imagePointsVector = cv.Contours2f.fromList([
-      cv.VecPoint2f.fromMat(corners).toList(),
-    ]);
+    final imagePointsVector = cv.Contours2f.fromList([corners.toList()]);
 
     {
       final cameraMatrix = cv.Mat.empty();