From 6289166a23c834f0eea0406e3173e9aeaca3ad35 Mon Sep 17 00:00:00 2001
From: chenxiang <>
Date: Sat, 2 May 2026 19:59:19 +0800
Subject: [PATCH] Fix Swift 6 / Xcode 26 compile crash in
 HybridBarcodeScannerOutput.swift.

---
 .../ios/HybridBarcodeScannerOutput.swift      | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/packages/react-native-vision-camera-barcode-scanner/ios/HybridBarcodeScannerOutput.swift b/packages/react-native-vision-camera-barcode-scanner/ios/HybridBarcodeScannerOutput.swift
index b78acd6399..82f6942d9e 100644
--- a/packages/react-native-vision-camera-barcode-scanner/ios/HybridBarcodeScannerOutput.swift
+++ b/packages/react-native-vision-camera-barcode-scanner/ios/HybridBarcodeScannerOutput.swift
@@ -13,6 +13,9 @@ import VisionCamera
 
 final class HybridBarcodeScannerOutput: HybridCameraOutputSpec, NativeCameraOutput {
   private let scanner: BarcodeScanner
+  private let onBarcodeScanned: (_ barcodes: [any HybridBarcodeSpec]) -> Void
+  private let onError: (_ error: Error) -> Void
+  private var isScanning = false
   private var delegate: BarcodeScannerDelegate? = nil
   private let queue: DispatchQueue
   let output: AVCaptureVideoDataOutput
@@ -32,37 +35,15 @@ final class HybridBarcodeScannerOutput: HybridCameraOutputSpec, NativeCameraOutp
 
   init(options: BarcodeScannerOutputOptions) {
     self.scanner = BarcodeScanner.barcodeScanner(options: options.toMLKitOptions())
+    self.onBarcodeScanned = options.onBarcodeScanned
+    self.onError = options.onError
     self.queue = DispatchQueue(label: "com.margelo.camera.barcodescanner")
     self.output = AVCaptureVideoDataOutput()
     super.init()
 
     // set delegate
-    var isScanning = false
     self.delegate = BarcodeScannerDelegate(onSampleBuffer: { [weak self] buffer in
-      guard let self else { return }
-      if isScanning { return }
-
-      // prepare MLImage
-      isScanning = true
-      guard let image = MLImage(sampleBuffer: buffer) else {
-        options.onError(
-          RuntimeError.error(withMessage: "Failed to convert CMSampleBuffer to MLImage!"))
-        return
-      }
-      image.orientation = self.outputOrientation.toUIImageOrientation()
-      // start scanning
-      self.scanner.process(image) { barcodes, error in
-        isScanning = false
-        if let barcodes {
-          // scanned x barcodes!
-          let hybridBarcodes = barcodes.map { HybridBarcode(barcode: $0) }
-          options.onBarcodeScanned(hybridBarcodes)
-        }
-        if let error {
-          // error
-          options.onError(error)
-        }
-      }
+      self?.scan(buffer)
     })
     self.output.setSampleBufferDelegate(delegate, queue: queue)
     self.output.alwaysDiscardsLateVideoFrames = true
@@ -72,6 +53,33 @@ final class HybridBarcodeScannerOutput: HybridCameraOutputSpec, NativeCameraOutp
     }
   }
 
+  private func scan(_ buffer: CMSampleBuffer) {
+    if isScanning { return }
+
+    // prepare MLImage
+    isScanning = true
+    guard let image = MLImage(sampleBuffer: buffer) else {
+      isScanning = false
+      onError(RuntimeError.error(withMessage: "Failed to convert CMSampleBuffer to MLImage!"))
+      return
+    }
+    image.orientation = outputOrientation.toUIImageOrientation()
+    // start scanning
+    scanner.process(image) { [weak self] barcodes, error in
+      guard let self else { return }
+      self.isScanning = false
+      if let barcodes {
+        // scanned x barcodes!
+        let hybridBarcodes: [any HybridBarcodeSpec] = barcodes.map { HybridBarcode(barcode: $0) }
+        self.onBarcodeScanned(hybridBarcodes)
+      }
+      if let error {
+        // error
+        self.onError(error)
+      }
+    }
+  }
+
   func configure(config: CameraOutputConfiguration) {
     guard let connection = self.output.connection(with: .video) else {
       return