From 3c5fa58a16206f07df77494b84fa2d4453bb92de Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Wed, 9 Jul 2025 12:46:57 +0200 Subject: [PATCH] suppress warnings for jzbar ffm usage --- build.gradle | 4 +++- .../com/sparrowwallet/sparrow/control/WebcamService.java | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index b33d64d4..7589ccd3 100644 --- a/build.gradle +++ b/build.gradle @@ -142,6 +142,7 @@ application { mainClass = 'com.sparrowwallet.sparrow.SparrowWallet' applicationDefaultJvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError", + "--enable-native-access=io.github.doblon8.jzbar", "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls", "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls", "--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls", @@ -190,7 +191,8 @@ jlink { options = ['--strip-native-commands', '--strip-java-debug-attributes', '--compress', 'zip-6', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*'] launcher { name = 'sparrow' - jvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls", + jvmArgs = ["--enable-native-access=io.github.doblon8.jzbar", + "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls", "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls", "--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls", "--add-opens=javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls", diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java b/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java index 318e8c71..dea223a1 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java @@ -315,9 +315,6 @@ public class WebcamService extends ScheduledService { } private Result readQR(BufferedImage bufferedImage) { - LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage); - BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); - try { com.sparrowwallet.bokmakierie.Result result = bokmakierie.scan(bufferedImage); if(result != null) { @@ -335,6 +332,8 @@ public class WebcamService extends ScheduledService { } try { + LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage); + BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); return qrReader.decode(bitmap, Map.of(DecodeHintType.TRY_HARDER, Boolean.TRUE)); } catch(ReaderException e) { // fall thru, it means there is no QR code in image