moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix unsigned int to long conversion

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1155340 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sergey Vladimirov 2011-08-09 12:53:05 +00:00
parent 0e3a966465
commit 33a1542335
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/org/apache/poi/util/LittleEndian.java
View File

@ -118,7 +118,7 @@ public class LittleEndian implements LittleEndianConsts {
*/ */
public static long getUInt(byte[] data, int offset) { public static long getUInt(byte[] data, int offset) {
long retNum = getInt(data, offset); long retNum = getInt(data, offset);
return retNum & 0x00FFFFFFFF; return retNum & 0x00FFFFFFFFl;
} }
/** /**
@ -140,7 +140,7 @@ public class LittleEndian implements LittleEndianConsts {
*/ */
public static long getLong(byte[] data, int offset) { public static long getLong(byte[] data, int offset) {
long result = 0; long result = 0;
for (int j = offset + LONG_SIZE - 1; j >= offset; j--) { for (int j = offset + LONG_SIZE - 1; j >= offset; j--) {
result <<= 8; result <<= 8;
result |= 0xff & data[j]; result |= 0xff & data[j];
@ -248,7 +248,7 @@ public class LittleEndian implements LittleEndianConsts {
public static void putLong(byte[] data, int offset, long value) { public static void putLong(byte[] data, int offset, long value) {
int limit = LONG_SIZE + offset; int limit = LONG_SIZE + offset;
long v = value; long v = value;
for (int j = offset; j < limit; j++) { for (int j = offset; j < limit; j++) {
data[j] = (byte) (v & 0xFF); data[j] = (byte) (v & 0xFF);
v >>= 8; v >>= 8;
@ -303,7 +303,7 @@ public class LittleEndian implements LittleEndianConsts {
} }
return (ch2 << 8) + (ch1 << 0); return (ch2 << 8) + (ch1 << 0);
} }
/** /**
* get an int value from an InputStream * get an int value from an InputStream
@ -347,8 +347,8 @@ public class LittleEndian implements LittleEndianConsts {
if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0) { if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0) {
throw new BufferUnderrunException(); throw new BufferUnderrunException();
} }
return return
((long)ch8 << 56) + ((long)ch8 << 56) +
((long)ch7 << 48) + ((long)ch7 << 48) +
((long)ch6 << 40) + ((long)ch6 << 40) +