mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug where images could not be resized and exceptions occured

Browse Source
This commit is contained in:
Brian Carrier 2013-08-20 13:16:24 -04:00
parent 2bc314d79f
commit ce306636a5
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewImagePanel.java
View File

@ -144,6 +144,10 @@ public class MediaViewImagePanel extends javax.swing.JPanel {
try { try {
//original input stream //original input stream
BufferedImage bi = ImageIO.read(inputStream); BufferedImage bi = ImageIO.read(inputStream);
if (bi == null) {
logger.log(Level.WARNING, "Could image reader not found for file: " + fileName);
return;
}
//scale image using Scalr //scale image using Scalr
BufferedImage biScaled = ScalrWrapper.resizeHighQuality(bi, (int) dims.getWidth(), (int) dims.getHeight()); BufferedImage biScaled = ScalrWrapper.resizeHighQuality(bi, (int) dims.getWidth(), (int) dims.getHeight());
//convert from awt imageto fx image //convert from awt imageto fx image

7
Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
View File

@ -86,6 +86,9 @@ class ThumbnailViewNode extends FilterNode {
if (getFile(content.getId()).exists()) { if (getFile(content.getId()).exists()) {
try { try {
icon = ImageIO.read(getFile(content.getId())); icon = ImageIO.read(getFile(content.getId()));
if (icon == null) {
icon = ThumbnailViewNode.defaultIcon;
}
} catch (IOException ex) { } catch (IOException ex) {
icon = ThumbnailViewNode.defaultIcon; icon = ThumbnailViewNode.defaultIcon;
} }
@ -120,6 +123,10 @@ class ThumbnailViewNode extends FilterNode {
try { try {
inputStream = new ReadContentInputStream(content); inputStream = new ReadContentInputStream(content);
BufferedImage bi = ImageIO.read(inputStream); BufferedImage bi = ImageIO.read(inputStream);
if (bi == null) {
logger.log(Level.WARNING, "No image reader for file: " + content.getName());
return null;
}
BufferedImage biScaled = ScalrWrapper.resizeFast(bi, 100, 100); BufferedImage biScaled = ScalrWrapper.resizeFast(bi, 100, 100);
return biScaled; return biScaled;
}catch (OutOfMemoryError e) { }catch (OutOfMemoryError e) {