Changeset 8243 in josm for trunk/src/com/drew/lang

Timestamp:

2015-04-21T00:42:50+02:00 (9 years ago)

Author:

Don-vip

Message:

fix #11359 - update to metadata-extractor 2.8.1

Location:

trunk/src/com/drew/lang

Files:

• RandomAccessReader.java (modified) (2 diffs)
• SequentialByteArrayReader.java (modified) (2 diffs)

trunk/src/com/drew/lang/RandomAccessReader.java

@@ -127 +127 @@
 
     /**
+     * Gets whether a bit at a specific index is set or not.
+     *
+     * @param index the number of bits at which to test
+     * @return true if the bit is set, otherwise false
+     * @throws IOException the buffer does not contain enough bytes to service the request, or index is negative
+     */
+    public boolean getBit(int index) throws IOException
+    {
+        int byteIndex = index / 8;
+        int bitIndex = index % 8;
+
+        validateIndex(byteIndex, 1);
+
+        byte b = getByte(byteIndex);
+        return ((b >> bitIndex) & 1) == 1;
+    }
+
+    /**
      * Returns an unsigned 8-bit int calculated from one byte of data at the specified index.
      *
@@ -195 +213 @@
             return (short) (((short)getByte(index + 1) << 8 & (short)0xFF00) |
                             ((short)getByte(index    )      & (short)0xFF));
+        }
+    }
+
+    /**
+     * Get a 24-bit unsigned integer from the buffer, returning it as an int.
+     *
+     * @param index position within the data buffer to read first byte
+     * @return the unsigned 24-bit int value as a long, between 0x00000000 and 0x00FFFFFF
+     * @throws IOException the buffer does not contain enough bytes to service the request, or index is negative
+     */
+    public int getInt24(int index) throws IOException
+    {
+        validateIndex(index, 3);
+
+        if (_isMotorolaByteOrder) {
+            // Motorola - MSB first (big endian)
+            return (((int)getByte(index    )) << 16 & 0xFF0000) |
+                   (((int)getByte(index + 1)) << 8  & 0xFF00) |
+                   (((int)getByte(index + 2))       & 0xFF);
+        } else {
+            // Intel ordering - LSB first (little endian)
+            return (((int)getByte(index + 2)) << 16 & 0xFF0000) |
+                   (((int)getByte(index + 1)) << 8  & 0xFF00) |
+                   (((int)getByte(index    ))       & 0xFF);
         }
     }

trunk/src/com/drew/lang/SequentialByteArrayReader.java

@@ -37 +37 @@
     private int _index;
 
+    public SequentialByteArrayReader(@NotNull byte[] bytes)
+    {
+        this(bytes, 0);
+    }
+
     @SuppressWarnings("ConstantConditions")
-    public SequentialByteArrayReader(@NotNull byte[] bytes)
+    public SequentialByteArrayReader(@NotNull byte[] bytes, int baseIndex)
     {
         if (bytes == null)
@@ -44 +49 @@
 
         _bytes = bytes;
-        _index = 0;
+        _index = baseIndex;
     }