Fixed bug where 0 byte pictures were treated incorrectly.

[meviz.git] / src / main / java / eu / svjatoslav / meviz / htmlindexer / Utils.java

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
index ab711a5..9da4656 100755 (executable)
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/Utils.java
@@ -1,7 +1,7 @@
 /*
  * Meviz - Various tools collection to work with multimedia.
  * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public License
  * as published by the Free Software Foundation.
@@ -24,14 +24,10 @@ import eu.svjatoslav.meviz.htmlindexer.layouts.MixedLayout;
 
 public class Utils {
 
-       private static File lastLoadedFile;
-
-       private static BufferedImage lastLoadedBufferedImage;
-
        /**
         * Load image into {@link BufferedImage} and return it. Caches last loaded
         * image to speed up subsequent loading attempts.
-        * 
+        *
         * @throws ImageFormatError
         * @throws IOException
         */
@@ -44,10 +40,13 @@ public class Utils {
                lastLoadedBufferedImage = ImageIO.read(file);
                lastLoadedFile = file;
 
-               if (lastLoadedBufferedImage == null)
+               if (lastLoadedBufferedImage == null) {
+                       System.out.println("Error reading image: " + file);
                        throw new ImageFormatError("File: " + file
                                        + " is not a valid image.");
 
+               }
+
                return lastLoadedBufferedImage;
        }
 
@@ -122,4 +121,8 @@ public class Utils {
                return isMevizFile;
        }
 
+       private static File lastLoadedFile;
+
+       private static BufferedImage lastLoadedBufferedImage;
+
 }