Switched to little-endian byte order by default.

This commit is contained in:
Michael Jumper
2010-07-01 00:15:08 -07:00
parent 19c25c2010
commit 73cead9679

View File

@@ -44,7 +44,7 @@ public class VNCFullColorImageReader extends VNCImageReader {
private boolean readAsIndexed; private boolean readAsIndexed;
public boolean isBigEndian() { public boolean isBigEndian() {
return true; return false;
} }
public int getBitsPerPixel() { public int getBitsPerPixel() {
@@ -97,11 +97,11 @@ public class VNCFullColorImageReader extends VNCImageReader {
this.greenBits = greenBits; this.greenBits = greenBits;
this.blueBits = blueBits; this.blueBits = blueBits;
redMax = (1 << redBits) - 1;
greenMax = (1 << greenBits) - 1;
blueMax = (1 << blueBits) - 1; blueMax = (1 << blueBits) - 1;
greenMax = (1 << greenBits) - 1;
redMax = (1 << redBits) - 1;
redShift = greenBits + blueBits; redShift = greenBits + blueBits;
greenShift = blueBits; greenShift = blueBits;
blueShift = 0; blueShift = 0;
@@ -120,9 +120,9 @@ public class VNCFullColorImageReader extends VNCImageReader {
if (redBits != 8 || greenBits != 8 || blueBits != 8) if (redBits != 8 || greenBits != 8 || blueBits != 8)
return readPixel(input); return readPixel(input);
int red = input.read();
int green = input.read();
int blue = input.read(); int blue = input.read();
int green = input.read();
int red = input.read();
int color = (red << 16) | (green << 8) | blue; int color = (red << 16) | (green << 8) | blue;
return color; return color;
@@ -136,10 +136,10 @@ public class VNCFullColorImageReader extends VNCImageReader {
value = input.read(); value = input.read();
break; break;
case 16: case 16:
value = input.readShort(); value = Short.reverseBytes(input.readShort());
break; break;
case 32: case 32:
value = input.readInt(); value = Integer.reverseBytes(input.readInt());
break; break;
default: default:
throw new IOException("Invalid BPP."); throw new IOException("Invalid BPP.");