summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/jogamp/opengl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-10-16 07:50:45 +0200
committerSven Gothel <[email protected]>2012-10-16 07:50:45 +0200
commit9ad5f1ea9f4ee9908fe5c5c422b287397b63e551 (patch)
tree38becf6642a670e1f08ffd206c26201761333a7b /src/jogl/classes/com/jogamp/opengl
parent658d269db957cdb986f2da2fbe15d2441b6f03c4 (diff)
parentf15b5df4114e46b4c6a968b75aebb6014afc1806 (diff)
Merge remote-tracking branch 'hharrison/master'
Diffstat (limited to 'src/jogl/classes/com/jogamp/opengl')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
index 37dbc54df..b7262aa3e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/texture/spi/LEDataInputStream.java
@@ -180,7 +180,7 @@ public class LEDataInputStream extends FilterInputStream implements DataInput
{
int i1 = readInt();
int i2 = readInt();
- return ((long)(i1) & 0xFFFFFFFFL) + (i2 << 32);
+ return ((long)i1 & 0xFFFFFFFFL) + ((long)i2 << 32);
}
public final float readFloat() throws IOException