Fixed bit shifting bug

drewnoakes · Sep 20, 2018 · 0d1c589 · 0d1c589
1 parent 156ba9f
commit 0d1c589
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Source/com/drew/lang/ByteUtil.java b/Source/com/drew/lang/ByteUtil.java
@@ -36,10 +36,10 @@ public static long getLong64(byte[] buffer, int offset, boolean bigEndian)
     {
         if (bigEndian) {
             return
-                ((buffer[offset    ] & 0xFF) << 56) |
-                ((buffer[offset + 1] & 0xFF) << 48) |
-                ((buffer[offset + 2] & 0xFF) << 40) |
-                ((buffer[offset + 3] & 0xFF) << 32) |
+                ((long) (buffer[offset    ] & 0xFF) << 56) |
+                ((long) (buffer[offset + 1] & 0xFF) << 48) |
+                ((long) (buffer[offset + 2] & 0xFF) << 40) |
+                ((long) (buffer[offset + 3] & 0xFF) << 32) |
                 ((buffer[offset + 4] & 0xFF) << 24) |
                 ((buffer[offset + 5] & 0xFF) << 16) |
                 ((buffer[offset + 6] & 0xFF) <<  8) |
@@ -51,10 +51,10 @@ public static long getLong64(byte[] buffer, int offset, boolean bigEndian)
                 ((buffer[offset + 1] & 0xFF) <<  8) |
                 ((buffer[offset + 2] & 0xFF) << 16) |
                 ((buffer[offset + 3] & 0xFF) << 24) |
-                ((buffer[offset + 4] & 0xFF) << 32) |
-                ((buffer[offset + 5] & 0xFF) << 40) |
-                ((buffer[offset + 6] & 0xFF) << 48) |
-                ((buffer[offset + 7] & 0xFF) << 56);
+                ((long) (buffer[offset + 4] & 0xFF) << 32) |
+                ((long) (buffer[offset + 5] & 0xFF) << 40) |
+                ((long) (buffer[offset + 6] & 0xFF) << 48) |
+                ((long) (buffer[offset + 7] & 0xFF) << 56);
         }
     }
 }