Merge pull request #49 from rainyl/issue48

fix: Stitcher.composePanorama

Author: rainyl

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.3+1
+
+- fix: Stitcher.composePanorama
+
 ## 1.0.3
 
 - New API: Mat::ptr -> Mat.ptrAt

lib/src/stitching/stitching.dart

@@ -153,11 +153,11 @@ class Stitcher extends CvStruct<cvg.PtrStitcher> {
   (StitcherStatus, Mat pano) composePanorama({VecMat? images}) {
     return using<(StitcherStatus, Mat)>((arena) {
       final rptr = arena<ffi.Int>();
-      final rpano = arena<cvg.Mat>();
+      final rpano = Mat.empty();
       images == null
           ? cvRun(() => CFFI.Stitcher_ComposePanorama(stitcher, rpano.ref, rptr))
           : cvRun(() => CFFI.Stitcher_ComposePanorama_1(stitcher, images.ref, rpano.ref, rptr));
-      return (StitcherStatus.fromInt(rptr.value), Mat.fromCMat(rpano.ref));
+      return (StitcherStatus.fromInt(rptr.value), rpano);
     });
   }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: opencv_dart
 description: "OpenCV4 bindings for Dart language and Flutter, using dart:ffi. The most complete OpenCV bindings for Dart!"
-version: 1.0.3
+version: 1.0.3+1
 binary_version: 1.0.3
 homepage: https://github.com/rainyl/opencv_dart
 

test/stitching_test.dart

@@ -12,7 +12,7 @@ void main() {
     final (status, pano) = stitcher.stitch(images.cvd);
     expect(status, cv.StitcherStatus.OK);
     expect(pano.isEmpty, false);
-    cv.imwrite('test/images_out/stitcher_test.jpg', pano);
+    // cv.imwrite('test/images_out/stitcher_test.jpg', pano);
   });
 
   test('cv.Stitcher with mask', () {
@@ -29,7 +29,7 @@ void main() {
     final (status, pano) = stitcher.stitch(images.cvd, masks: masks.cvd);
     expect(status, cv.StitcherStatus.OK);
     expect(pano.isEmpty, false);
-    cv.imwrite('test/images_out/stitcher_test_mask.jpg', pano);
+    // cv.imwrite('test/images_out/stitcher_test_mask.jpg', pano);
   });
 
   test('cv.Stitcher getter/setter', () {
@@ -57,4 +57,26 @@ void main() {
 
     expect(stitcher.component.length, greaterThanOrEqualTo(0));
   });
+
+  test('Issue 48', () {
+    final images = [
+      cv.imread("test/images/barcode1.png", flags: cv.IMREAD_COLOR),
+      cv.imread("test/images/barcode2.png", flags: cv.IMREAD_COLOR),
+    ];
+
+    // Create Stitcher object
+    final cv.Stitcher stitcher = cv.Stitcher.create();
+
+    // Estimate transformations and stitch images
+    final cv.StitcherStatus status = stitcher.estimateTransform(images.cvd);
+    expect(status, cv.StitcherStatus.OK);
+
+    final result = stitcher.composePanorama();
+    expect(result.$1, cv.StitcherStatus.OK);
+    expect(result.$2.isEmpty, false);
+
+    final result1 = stitcher.composePanorama(images: images.cvd);
+    expect(result1.$1, cv.StitcherStatus.OK);
+    expect(result1.$2.isEmpty, false);
+  });
 }