From fb48643466c45ae551520620f8eba8237f9d0116 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Mon, 16 Mar 2026 12:00:10 +0200 Subject: [PATCH] load jzbar native dependencies explicitly --- src/main/java/com/sparrowwallet/sparrow/io/ZBar.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sparrowwallet/sparrow/io/ZBar.java b/src/main/java/com/sparrowwallet/sparrow/io/ZBar.java index 2315fac8..87197d63 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/ZBar.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/ZBar.java @@ -24,7 +24,12 @@ public class ZBar { if(!zbarLoaded) { String javaHome = System.getProperty("java.home"); if(javaHome != null) { - File libFile = new File(javaHome, "lib" + java.io.File.separator + System.mapLibraryName("zbar")); + File libDir = new File(javaHome, "lib"); + File iconvFile = new File(libDir, "iconv-2.dll"); + if(iconvFile.exists()) { + System.load(iconvFile.getAbsolutePath()); + } + File libFile = new File(libDir, System.mapLibraryName("zbar")); if(libFile.exists()) { System.load(libFile.getAbsolutePath()); }