aboutsummaryrefslogtreecommitdiff
path: root/juick-common/src/main/java/com/juick/server/util
diff options
context:
space:
mode:
Diffstat (limited to 'juick-common/src/main/java/com/juick/server/util')
-rw-r--r--juick-common/src/main/java/com/juick/server/util/ImageUtils.java33
1 files changed, 16 insertions, 17 deletions
diff --git a/juick-common/src/main/java/com/juick/server/util/ImageUtils.java b/juick-common/src/main/java/com/juick/server/util/ImageUtils.java
index d6a455a4..3e03314b 100644
--- a/juick-common/src/main/java/com/juick/server/util/ImageUtils.java
+++ b/juick-common/src/main/java/com/juick/server/util/ImageUtils.java
@@ -149,25 +149,24 @@ public class ImageUtils {
}
public Attachment getAttachment(File imgFile) throws IOException {
Attachment attachment = new Attachment();
- int pos = imgFile.getName().lastIndexOf(".");
- if (pos == -1)
- throw new IOException("No extension for file: " + imgFile.getAbsolutePath());
- String suffix = imgFile.getName().substring(pos + 1);
- Iterator<ImageReader> iter = ImageIO.getImageReadersBySuffix(suffix);
- while(iter.hasNext()) {
- ImageReader reader = iter.next();
- try (ImageInputStream stream = ImageIO.createImageInputStream(imgFile)) {
- reader.setInput(stream);
- attachment.setWidth(reader.getWidth(reader.getMinIndex()));
- attachment.setHeight(reader.getHeight(reader.getMinIndex()));
- return attachment;
- } catch (Exception e) {
- logger.debug("Error reading {}, trying next reader", imgFile.getAbsolutePath());
- } finally {
- reader.dispose();
+ try (ImageInputStream stream = ImageIO.createImageInputStream(imgFile)) {
+ Iterator<ImageReader> iter = ImageIO.getImageReaders(stream);
+ while (iter.hasNext()) {
+ ImageReader reader = iter.next();
+ try {
+ reader.setInput(stream);
+ attachment.setWidth(reader.getWidth(reader.getMinIndex()));
+ attachment.setHeight(reader.getHeight(reader.getMinIndex()));
+ return attachment;
+ } catch (Exception e) {
+ logger.debug("Error reading {}, trying next reader", imgFile.getAbsolutePath());
+ } finally {
+ reader.dispose();
+ }
}
}
- throw new IOException("Not a known image file: " + imgFile.getAbsolutePath());
+ logger.warn("Not a known image file {}", imgFile.getAbsolutePath());
+ return attachment;
}
} \ No newline at end of file