mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix image loading from resources on Windows

Browse Source 
This should hopefully resolve images failing to load from resources
on Windows due to problems with imread encountering "can't open/read
file: check file path/integrity".
This commit is contained in:
Devin Bileck 2024-03-01 11:45:16 -08:00
parent 0f373cee43
commit e6e9608473
No known key found for this signature in database
GPG Key ID: 649D9C87FB168B88
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
desktop/src/test/java/bisq/desktop/main/account/content/notifications/qr/FrameUtil.java
View File

@ -17,16 +17,22 @@
package bisq.desktop.main.account.content.notifications.qr;
import org.apache.commons.io.IOUtils;
import java.nio.ByteBuffer;
import java.util.Objects;
import java.io.IOException;
import java.io.InputStream;
import org.jetbrains.annotations.NotNull;
import static org.bytedeco.opencv.global.opencv_imgcodecs.imread;
import static org.bytedeco.opencv.global.opencv_imgcodecs.imdecode;
import static org.opencv.imgcodecs.Imgcodecs.IMREAD_ANYCOLOR;
import static org.opencv.imgcodecs.Imgcodecs.IMREAD_ANYDEPTH;
import org.bytedeco.javacpp.BytePointer;
import org.bytedeco.javacv.Frame;
import org.bytedeco.javacv.OpenCVFrameConverter;
import org.bytedeco.opencv.opencv_core.Mat;
@ -51,17 +57,20 @@ public class FrameUtil {
}
public static Frame createFrameFromImageResource(@NotNull final String imagePath) {
final String resImagePath = Objects.requireNonNull(
FrameUtil.class.getClassLoader().getResource(imagePath),
"Cannot find resource: " + imagePath
).getPath();
final Mat imageMat = imread(resImagePath);
if (imageMat.empty()) {
throw new IllegalArgumentException("Image could not be loaded: " + imagePath);
}
try (OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat()) {
try (
InputStream is = FrameUtil.class.getClassLoader().getResourceAsStream(imagePath);
OpenCVFrameConverter.ToMat converter = new OpenCVFrameConverter.ToMat()
) {
if (is == null) {
throw new IllegalArgumentException("Image could not be loaded: " + imagePath);
}
Mat imageMat = imdecode(new Mat(new BytePointer(IOUtils.toByteArray(is))), IMREAD_ANYDEPTH | IMREAD_ANYCOLOR);
if (imageMat.empty()) {
throw new IllegalArgumentException("Image could not be loaded: " + imagePath);
}
return converter.convert(imageMat);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
}