Changeset 9379

Timestamp:

07/20/07 18:03:19 (5 years ago)

Author:

anp

Message:

maj librairie imageInfo 1.9

File:

• trunk/Jav_EXT/com/scenari/ext/img2props/ImageInfo.java (modified) (8 diffs)

trunk/Jav_EXT/com/scenari/ext/img2props/ImageInfo.java

@@ -2 +2 @@
  * ImageInfo.java
  *
- * Version 1.7
+ * Version 1.9
  *
  * A Java class to determine image width, height and color depth for
@@ -76 +76 @@
  * This class is contributed to the Public Domain.
  * Use it at your own risk.
- * <p>
- * Last modification 2005-07-26.
  * <p>
  * <a name="history">History</a>:
@@ -139 +137 @@
  *  was repeatedly requested by some users).
  *  Released as 1.7.</li>
+ *  <li><strong>2006-02-23</strong> Removed Flash helper methods which weren't used elsewhere.
+ *   Updated skip method which tries "read" whenever "skip(Bytes)" returns a result of 0.
+ *   The old method didn't work with certain input stream types on truncated data streams.
+ *   Thanks to Martin Leidig for reporting this and sending in code.
+ *   Released as 1.8.</li>
+ *  </li>
+ *  <li><strong>2006-11-13</strong> Removed check that made ImageInfo report JPEG APPx
+ *   markers smaller than 14 bytes as files in unknown format. Such JPEGs seem to be
+ *   generated by Google's Picasa application. First reported with fix by 
+ *   Karl von Randow. Released as 1.9.</li>  
  * </ul>
  * @author Marco Schmidt
@@ -249 +257 @@
         private int physicalHeightDpi;
         private int physicalWidthDpi;
-        private int bitBuf;
-        private int bitPos;
 
         private void addComment(String s) {
@@ -523 +529 @@
                         if (marker == 0xffe0) { // APPx 
                                 if (size < 14) {
-                                        return false; // APPx header must be >= 14 bytes
+                                        // not an APPx header as we know it, skip
+                                        skip(size - 2);
+                                        continue;
                                 }
                                 if (read(data, 0, 12) != 12) {
@@ -1002 +1010 @@
                                         System.out.println(e);
                                         try {
-                                                in.close();
+                                                if (in != null) {
+                                                        in.close();
+                                                }
                                         } catch (IOException ee) {
                                         }
@@ -1127 +1137 @@
         }
 
-        private long readUBits( int numBits ) throws IOException
-        {
-                if (numBits == 0) {
-                        return 0;
-                }
-                int bitsLeft = numBits;
-                long result = 0;
-                if (bitPos == 0) { //no value in the buffer - read a byte
-                        if (in != null) {
-                                bitBuf = in.read();
-                        } else {
-                                bitBuf = din.readByte();
-                        }
-                        bitPos = 8;
-                }
-        
-            while( true )
-        {
-            int shift = bitsLeft - bitPos;
-            if( shift > 0 )
-            {
-                // Consume the entire buffer
-                result |= bitBuf << shift;
-                bitsLeft -= bitPos;
-
-                // Get the next byte from the input stream
-                if (in != null) {
-                  bitBuf = in.read();
-                } else {
-                  bitBuf = din.readByte();
-                }
-                bitPos = 8;
-            }
-            else
-            {
-                // Consume a portion of the buffer
-                result |= bitBuf >> -shift;
-                bitPos -= bitsLeft;
-                bitBuf &= 0xff >> (8 - bitPos); // mask off the consumed bits
-
-                return result;
-            }
-        }        
-    }
-    
-    /**
-     * Read a signed integer value from input.
-     * @param numBits number of bits to read
-     */
-    private int readSBits(int numBits) throws IOException
-    {
-        // Get the number as an unsigned value.
-        long uBits = readUBits( numBits );
-
-        // Is the number negative?
-        if( ( uBits & (1L << (numBits - 1))) != 0 )
-        {
-            // Yes. Extend the sign.
-            uBits |= -1L << numBits;
-        }
-
-        return (int)uBits;        
-    }  
-   
-/*      private void synchBits()
-        {
-                bitBuf = 0;
-                bitPos = 0;
-        }*/
-
-/*      private String readLine(int firstChar) throws IOException {
-                StringBuffer result = new StringBuffer();
-                result.append((char)firstChar);
-                return readLine(result);
-        }*/
-
         private static void run(String sourceName, InputStream in, ImageInfo imageInfo, boolean verbose) {
                 imageInfo.setInput(in);
@@ -1272 +1206 @@
         }
 
-        private void skip(int num) throws IOException {
-                while (num > 0) {
-                        long result;
-                        if (in != null) {
-                                result = in.skip(num);
-                        } else {
-                                result = din.skipBytes(num);
-                        }
-                        if (result > 0) {
-                                num -= result;
-                        }
-                }
-        }
+    private void skip(int num) throws IOException {
+        while (num > 0) {
+            long result;
+            if (in != null) {
+                result = in.skip(num);
+            } else {
+                result = din.skipBytes(num);
+            }
+            if (result > 0) {
+                num -= result;
+            } else {
+                if (in != null) {
+                    result = in.read();
+                } else {
+                    result = din.readByte();
+                }
+                if (result == -1) {
+                        throw new IOException("Premature end of input.");
+                } else {
+                        num--;
+                }
+            }
+        }
+    }
 }