ilabs-flir 2.2.30 → 2.2.32

package/Flir.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Flir'
-  s.version      = '2.2.21'
+  s.version      = '2.2.31'
   s.summary      = 'FLIR Thermal SDK React Native - Bundled via postinstall'
   s.description  = <<-DESC
     A React Native wrapper for the FLIR Thermal SDK, providing thermal imaging
@@ -94,14 +94,15 @@ Pod::Spec.new do |s|
       # Vendored frameworks - the actual SDK
       s.vendored_frameworks = [
         'ios/Flir/Frameworks/ThermalSDK.xcframework',
-        'ios/Flir/Frameworks/libavcodec.61.dylib.xcframework',
-        'ios/Flir/Frameworks/libavdevice.61.dylib.xcframework', 
-        'ios/Flir/Frameworks/libavfilter.10.dylib.xcframework',
-        'ios/Flir/Frameworks/libavformat.61.dylib.xcframework',
-        'ios/Flir/Frameworks/libavutil.59.dylib.xcframework',
+        'ios/Flir/Frameworks/MeterLink.xcframework',
+        'ios/Flir/Frameworks/libavcodec.62.dylib.xcframework',
+        'ios/Flir/Frameworks/libavdevice.62.dylib.xcframework', 
+        'ios/Flir/Frameworks/libavfilter.11.dylib.xcframework',
+        'ios/Flir/Frameworks/libavformat.62.dylib.xcframework',
+        'ios/Flir/Frameworks/libavutil.60.dylib.xcframework',
         'ios/Flir/Frameworks/liblive666.dylib.xcframework',
-        'ios/Flir/Frameworks/libswresample.5.dylib.xcframework',
-        'ios/Flir/Frameworks/libswscale.8.dylib.xcframework'
+        'ios/Flir/Frameworks/libswresample.6.dylib.xcframework',
+        'ios/Flir/Frameworks/libswscale.9.dylib.xcframework'
       ].select { |f| File.exist?(File.join(__dir__, f)) }
       
       s.pod_target_xcconfig = {

package/ios/Flir/src/FlirManager.swift

@@ -364,14 +364,22 @@ import ThermalSDK
     
     @objc public func getTemperatureAt(x: Int, y: Int) -> Double {
 #if FLIR_ENABLED
-        guard let streamer = streamer else { return Double.nan }
+        guard let streamer = streamer, _isStreaming else { return Double.nan }
         
         var result = Double.nan
         streamer.withThermalImage { thermalImage in
-            let w = thermalImage.getWidth()
-            let h = thermalImage.getHeight()
-            let cx = max(0, min(Int(w) - 1, x))
-            let cy = max(0, min(Int(h) - 1, y))
+            let w = Double(thermalImage.getWidth())
+            let h = Double(thermalImage.getHeight())
+            
+            // Map incoming integer coordinates (from latestImage) to normalized, then to sensor
+            // This assumes x,y are in latestImage coordinate space.
+            guard let img = self.latestImage, img.size.width > 0, img.size.height > 0 else { return }
+            
+            let nx = Double(x) / Double(img.size.width)
+            let ny = Double(y) / Double(img.size.height)
+            
+            let cx = max(0, min(Int(w) - 1, Int(nx * w)))
+            let cy = max(0, min(Int(h) - 1, Int(ny * h)))
             
             if let measurements = thermalImage.measurements,
                let spot = try? measurements.addSpot(CGPoint(x: cx, y: cy)) {
@@ -393,10 +401,28 @@ import ThermalSDK
 
     
     @objc public func getTemperatureAtNormalized(_ nx: Double, y: Double) -> Double {
-        guard let img = latestImage else { return Double.nan }
-        let px = Int(nx * Double(img.size.width))
-        let py = Int(y * Double(img.size.height))
-        return getTemperatureAt(x: px, y: py)
+#if FLIR_ENABLED
+        guard let streamer = streamer, _isStreaming else { return Double.nan }
+        
+        var result = Double.nan
+        streamer.withThermalImage { thermalImage in
+            let w = Double(thermalImage.getWidth())
+            let h = Double(thermalImage.getHeight())
+            
+            // Map normalized (0.0 - 1.0) to actual sensor pixels
+            let cx = max(0, min(Int(w) - 1, Int(nx * w)))
+            let cy = max(0, min(Int(h) - 1, Int(y * h)))
+            
+            if let measurements = thermalImage.measurements,
+               let spot = try? measurements.addSpot(CGPoint(x: cx, y: cy)) {
+                result = spot.getValue().value
+                try? measurements.remove(spot)
+            }
+        }
+        return result
+#else
+        return Double.nan
+#endif
     }
     
     // MARK: - Legacy / Compatibility Methods
@@ -604,16 +630,21 @@ extension FlirManager: FLIRStreamDelegate {
         _isProcessingFrame = true
         renderQueue.async { [weak self] in
             defer { self?._isProcessingFrame = false }
-            guard let self = self, let streamer = self.streamer else {
-                NSLog("[FLIR-TRACE ❌] No self or streamer in renderQueue")
+            guard let self = self, self._isStreaming, let streamer = self.streamer else {
+                NSLog("[FLIR-TRACE ❌] No self, streamer or not streaming in renderQueue")
                 return
             }
             
             NSLog("[FLIR-TRACE 2️⃣] Processing on renderQueue")
             
             do {
-                try streamer.update()
-                NSLog("[FLIR-TRACE 3️⃣] Streamer updated successfully")
+                // Double check streaming state before update to prevent EXC_BAD_ACCESS during shutdown
+                if self._isStreaming {
+                    try streamer.update()
+                    NSLog("[FLIR-TRACE 3️⃣] Streamer updated successfully")
+                } else {
+                    return
+                }
             } catch {
                 NSLog("[FLIR-TRACE ❌] Streamer update failed: \(error)")
                 return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilabs-flir",
-  "version": "2.2.30",
+  "version": "2.2.32",
   "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/scripts/fetch-binaries.js

@@ -192,7 +192,7 @@ async function run() {
           args[key] = value;
         } else {
           // if following arg exists and doesn't start with '-', use it as the value
-          const next = argv[i+1];
+          const next = argv[i + 1];
           if (next && !next.startsWith('-')) {
             args[cur.replace(/^--/, '')] = next;
             i++;
@@ -202,7 +202,7 @@ async function run() {
         }
       } else if (cur.startsWith('-')) {
         const key = cur.replace(/^-+/, '');
-        const next = argv[i+1];
+        const next = argv[i + 1];
         if (next && !next.startsWith('-')) {
           args[key] = next;
           i++;
@@ -254,7 +254,7 @@ async function run() {
     // Clean out TMP_DIR (remove all contents) to avoid conflicts for iOS
     fs.readdirSync(TMP_DIR).forEach(f => {
       const fp = path.join(TMP_DIR, f);
-      try { fs.rmSync(fp, { recursive: true, force: true }); } catch (e) {}
+      try { fs.rmSync(fp, { recursive: true, force: true }); } catch (e) { }
     });
 
     if (skipIfPresent && platformArg !== 'android' && hasIosFrameworks(DEST_IOS)) {
@@ -270,7 +270,7 @@ async function run() {
     }
 
     // Cleanup tmp
-    try { fs.rmSync(TMP_DIR, { recursive: true, force: true }); } catch (e) {}
+    try { fs.rmSync(TMP_DIR, { recursive: true, force: true }); } catch (e) { }
 
     console.log('FLIR SDK binaries fetched and installed into the package folders.');
   } catch (err) {
@@ -278,7 +278,7 @@ async function run() {
     process.exit(1);
   } finally {
     // Always attempt to remove temporary folder to avoid leaving cruft
-    try { fs.rmSync(TMP_DIR, { recursive: true, force: true }); } catch (e) {}
+    try { fs.rmSync(TMP_DIR, { recursive: true, force: true }); } catch (e) { }
   }
 }