fix: several bugs

chooyan-eng · Dec 12, 2024 · 9d04f82 · 9d04f82
1 parent 35a425b
commit 9d04f82
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 22 deletions.
diff --git a/lib/src/logic/cropper/image_image_cropper.dart b/lib/src/logic/cropper/image_image_cropper.dart
@@ -27,7 +27,7 @@ final RectCropper<Image> defaultRectCropper = (
   required Size size,
   required ImageFormat? outputFormat,
 }) {
-  return _findCropFunc(outputFormat)(
+  return _findEncodeFunc(outputFormat)(
     copyCrop(
       original,
       x: topLeft.dx.toInt(),
@@ -46,17 +46,21 @@ final CircleCropper<Image> defaultCircleCropper = (
   required double radius,
   required ImageFormat? outputFormat,
 }) {
-  return _findCropFunc(outputFormat)(
+  // convert to rgba if necessary
+  final target =
+      original.numChannels == 4 ? original : original.convert(numChannels: 4);
+
+  return _findCircleEncodeFunc(outputFormat)(
     copyCropCircle(
-      original,
+      target,
       centerX: center.dx.toInt(),
       centerY: center.dy.toInt(),
       radius: radius.toInt(),
     ),
   );
 };
 
-Uint8List Function(Image) _findCropFunc(ImageFormat? outputFormat) {
+Uint8List Function(Image) _findEncodeFunc(ImageFormat? outputFormat) {
   return switch (outputFormat) {
     ImageFormat.bmp => encodeBmp,
     ImageFormat.ico => encodeIco,
@@ -65,3 +69,13 @@ Uint8List Function(Image) _findCropFunc(ImageFormat? outputFormat) {
     _ => encodePng,
   };
 }
+
+Uint8List Function(Image) _findCircleEncodeFunc(ImageFormat? outputFormat) {
+  return switch (outputFormat) {
+    ImageFormat.bmp => encodeBmp,
+    ImageFormat.ico => encodeIco,
+    ImageFormat.jpeg => encodePng, // jpeg does not support circle crop
+    ImageFormat.png => encodePng,
+    _ => encodePng,
+  };
+}
diff --git a/lib/src/logic/cropper/legacy_image_image_cropper.dart b/lib/src/logic/cropper/legacy_image_image_cropper.dart
@@ -47,9 +47,13 @@ final CircleCropper<Image> legacyCircleCropper = (
   required double radius,
   required ImageFormat? outputFormat,
 }) {
+  // convert to rgba if necessary
+  final target =
+      original.numChannels == 4 ? original : original.convert(numChannels: 4);
+
   return encodePng(
     copyCropCircle(
-      original,
+      target,
       centerX: center.dx.toInt(),
       centerY: center.dy.toInt(),
       radius: radius.toInt(),

diff --git a/lib/src/widget/crop.dart b/lib/src/widget/crop.dart
@@ -347,11 +347,13 @@ class _CropEditorState extends State<_CropEditor> {
         return;
       }
       if (parsed != null) {
-        setState(() {
-          _viewState = (_viewState as PreparingCropEditorViewState).prepared(
-            Size(parsed.width, parsed.height),
-          );
-        });
+        if (_viewState is PreparingCropEditorViewState) {
+          setState(() {
+            _viewState = (_viewState as PreparingCropEditorViewState).prepared(
+              Size(parsed.width, parsed.height),
+            );
+          });
+        }
         _resetCropRect();
         widget.onStatusChanged?.call(CropStatus.ready);
       }
@@ -374,13 +376,6 @@ class _CropEditorState extends State<_CropEditor> {
 
     widget.onStatusChanged?.call(CropStatus.loading);
 
-    /// reset view state back to preparing state
-    _viewState = PreparingCropEditorViewState(
-      viewportSize: MediaQuery.of(context).size,
-      withCircleUi: widget.withCircleUi,
-      aspectRatio: widget.aspectRatio,
-    );
-
     _parseImageWith(
       parser: widget.imageParser,
       formatDetector: widget.formatDetector,
@@ -390,11 +385,13 @@ class _CropEditorState extends State<_CropEditor> {
         return;
       }
       if (parsed != null) {
-        setState(() {
-          _viewState = (_viewState as PreparingCropEditorViewState).prepared(
-            Size(parsed.width, parsed.height),
-          );
-        });
+        if (_viewState is PreparingCropEditorViewState) {
+          setState(() {
+            _viewState = (_viewState as PreparingCropEditorViewState).prepared(
+              Size(parsed.width, parsed.height),
+            );
+          });
+        }
         _resetCropRect();
         widget.onStatusChanged?.call(CropStatus.ready);
       }