Changeset 3284

Timestamp:

10/17/07 10:05:02 (12 years ago)

Author:

melissa

Message:

Corrected pixel type for 5-5-5 RGB data.

File:

• trunk/loci/formats/in/PictReader.java (modified) (3 diffs)

trunk/loci/formats/in/PictReader.java

@@ -241 +241 @@
     }
     else {
-      // 16 bit data
-      short[] data = new short[3 * core.sizeY[0] * core.sizeX[0]];
+      byte[] data = new byte[3 * core.sizeY[0] * core.sizeX[0]];
 
       int outIndex = 0;
@@ -251 +250 @@
           if (j < core.sizeX[0]) {
             if (outIndex >= data.length - 2) break;
-            int s0 = (row[j] & 0x1f);
-            int s1 = (row[j] & 0x3e0) >> 5; // 0x1f << 5;
-            int s2 = (row[j] & 0x7c00) >> 10; // 0x1f << 10;
-            data[outIndex] = (short) s2;
-            data[outIndex+1] = (short) s1;
-            data[outIndex+2] = (short) s0;
+            data[outIndex] = (byte) ((row[j] & 0x7c00) >> 10);
+            data[outIndex+1] = (byte) ((row[j] & 0x3e0) >> 5);
+            data[outIndex+2] = (byte) (row[j] & 0x1f);
           }
           else j = row.length;
@@ -263 +259 @@
 
       if (debug) {
-        debug("openBytes: 16-bit data, " + core.sizeX[0] + " x " +
+        debug("openBytes: 8-bit RGB data, " + core.sizeX[0] + " x " +
           core.sizeY[0] + ", length=" + data.length);
       }