[Gzz-commits] navidoc/org/nongnu/navidoc/util ImageSize.java

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/20 04:48:17

Modified files:
        org/nongnu/navidoc/util: ImageSize.java 

Log message:
        Separate call for inputstream

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/org/nongnu/navidoc/util/ImageSize.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: navidoc/org/nongnu/navidoc/util/ImageSize.java
diff -u navidoc/org/nongnu/navidoc/util/ImageSize.java:1.1 
navidoc/org/nongnu/navidoc/util/ImageSize.java:1.2
--- navidoc/org/nongnu/navidoc/util/ImageSize.java:1.1  Sun Apr 20 04:17:45 2003
+++ navidoc/org/nongnu/navidoc/util/ImageSize.java      Sun Apr 20 04:48:17 2003
@@ -48,11 +48,22 @@
               ub(b[2]) * 256 +
               ub(b[3]);
     }
+
     /** Read the size of an image file.
      */
     static public Dimension readSize(File f) {
        try {
            FileInputStream is = new FileInputStream(f);
+           return readSize(is);
+       } catch(IOException e) {
+           return null;
+       }
+    }
+
+    /** Read the size of an image given an inputstream.
+     */
+    static public Dimension readSize(InputStream is) {
+       try {
            byte[] in = new byte[4];
            is.read(in);
            if(ub(in[0]) == 0x89 &&