fix return image being ignored on iOS

@@ -25,9 +25,6 @@ public class MobileScanner: NSObject, AVCaptureVideoDataOutputSampleBufferDelega
     /// Barcode scanner for results
     /// Barcode scanner for results
     var scanner = BarcodeScanner.barcodeScanner()
     var scanner = BarcodeScanner.barcodeScanner()
 
 
-    /// Return image buffer with the Barcode event
-    var returnImage: Bool = false
-
     /// Default position of camera
     /// Default position of camera
     var videoPosition: AVCaptureDevice.Position = AVCaptureDevice.Position.back
     var videoPosition: AVCaptureDevice.Position = AVCaptureDevice.Position.back
 
 
@@ -172,7 +169,7 @@ public class MobileScanner: NSObject, AVCaptureVideoDataOutputSampleBufferDelega
     }
     }
 
 
     /// Start scanning for barcodes
     /// Start scanning for barcodes
-    func start(barcodeScannerOptions: BarcodeScannerOptions?, returnImage: Bool, cameraPosition: AVCaptureDevice.Position, torch: Bool, detectionSpeed: DetectionSpeed, completion: @escaping (MobileScannerStartParameters) -> ()) throws {
+    func start(barcodeScannerOptions: BarcodeScannerOptions?, cameraPosition: AVCaptureDevice.Position, torch: Bool, detectionSpeed: DetectionSpeed, completion: @escaping (MobileScannerStartParameters) -> ()) throws {
         self.detectionSpeed = detectionSpeed
         self.detectionSpeed = detectionSpeed
         if (device != nil || captureSession != nil) {
         if (device != nil || captureSession != nil) {
             throw MobileScannerError.alreadyStarted
             throw MobileScannerError.alreadyStarted

@@ -12,6 +12,10 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
     /// The handler sends all information via an event channel back to Flutter
     /// The handler sends all information via an event channel back to Flutter
     private let barcodeHandler: BarcodeHandler
     private let barcodeHandler: BarcodeHandler
     
     
+    /// Whether to return the input image with the barcode event.
+    /// This is static to avoid accessing `self` in the callback in the constructor.
+    private static var returnImage: Bool = false
+
     /// The points for the scan window.
     /// The points for the scan window.
     static var scanWindow: [CGFloat]?
     static var scanWindow: [CGFloat]?
     
     
@@ -58,9 +62,27 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
                 return nil
                 return nil
             }
             }
             
             
-            if (!barcodesMap.isEmpty) {
-                barcodeHandler.publishEvent(["name": "barcode", "data": barcodesMap, "image": FlutterStandardTypedData(bytes: image.jpegData(compressionQuality: 0.8)!), "width": image.size.width, "height": image.size.height])
+            if (barcodesMap.isEmpty) {
+                return
+            }
+            
+            if (!MobileScannerPlugin.returnImage) {
+                barcodeHandler.publishEvent([
+                    "name": "barcode",
+                    "data": barcodesMap,
+                ])
+                return
             }
             }
+            
+            barcodeHandler.publishEvent([
+                "name": "barcode",
+                "data": barcodesMap,
+                "image": [
+                    "bytes": FlutterStandardTypedData(bytes: image.jpegData(compressionQuality: 0.8)!),
+                    "width": image.size.width,
+                    "height": image.size.height,
+                ],
+            ])
         }, torchModeChangeCallback: { torchState in
         }, torchModeChangeCallback: { torchState in
             barcodeHandler.publishEvent(["name": "torchState", "data": torchState])
             barcodeHandler.publishEvent(["name": "torchState", "data": torchState])
         }, zoomScaleChangeCallback: { zoomScale in
         }, zoomScaleChangeCallback: { zoomScale in
@@ -110,6 +132,7 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
         let speed: Int = (call.arguments as! Dictionary<String, Any?>)["speed"] as? Int ?? 0
         let speed: Int = (call.arguments as! Dictionary<String, Any?>)["speed"] as? Int ?? 0
         let timeoutMs: Int = (call.arguments as! Dictionary<String, Any?>)["timeout"] as? Int ?? 0
         let timeoutMs: Int = (call.arguments as! Dictionary<String, Any?>)["timeout"] as? Int ?? 0
         self.mobileScanner.timeoutSeconds = Double(timeoutMs) / Double(1000)
         self.mobileScanner.timeoutSeconds = Double(timeoutMs) / Double(1000)
+        MobileScannerPlugin.returnImage = returnImage
 
 
         let formatList = formats.map { format in return BarcodeFormat(rawValue: format)}
         let formatList = formats.map { format in return BarcodeFormat(rawValue: format)}
         var barcodeOptions: BarcodeScannerOptions? = nil
         var barcodeOptions: BarcodeScannerOptions? = nil
@@ -126,7 +149,7 @@ public class MobileScannerPlugin: NSObject, FlutterPlugin {
         let detectionSpeed: DetectionSpeed = DetectionSpeed(rawValue: speed)!
         let detectionSpeed: DetectionSpeed = DetectionSpeed(rawValue: speed)!
 
 
         do {
         do {
-            try mobileScanner.start(barcodeScannerOptions: barcodeOptions, returnImage: returnImage, cameraPosition: position, torch: torch, detectionSpeed: detectionSpeed) { parameters in
+            try mobileScanner.start(barcodeScannerOptions: barcodeOptions, cameraPosition: position, torch: torch, detectionSpeed: detectionSpeed) { parameters in
                 DispatchQueue.main.async {
                 DispatchQueue.main.async {
                     result([
                     result([
                         "textureId": parameters.textureId,
                         "textureId": parameters.textureId,