Changeset 3267

Timestamp:

10/11/07 13:45:37 (12 years ago)

Author:

melissa

Message:

Added new ColorSpace for 2-channel images; updated ImageTools accordingly.

Location:

trunk/loci/formats

Files:

• ImageTools.java (modified) (7 diffs)
• TwoChannelColorSpace.java (added)

trunk/loci/formats/ImageTools.java

@@ -123 +123 @@
     if (c == 1) return makeImage(data, w, h);
     int dataType = DataBuffer.TYPE_BYTE;
-    if (c == 2) {
-      byte[] tmp = data;
-      data = new byte[(tmp.length / 2) * 3];
-      if (interleaved) {
-        for (int i=0; i<tmp.length/2; i++) {
-          data[i*3] = tmp[i*2];
-          data[i*3 + 1] = tmp[i*2 + 1];
-        }
-      }
-      else System.arraycopy(tmp, 0, data, 0, tmp.length);
-      c++;
-    }
     DataBuffer buffer = new DataBufferByte(data, c * w * h);
     return constructImage(c, dataType, w, h, interleaved, false, buffer);
@@ -155 +143 @@
     if (c == 1) return makeImage(data, w, h);
     int dataType = DataBuffer.TYPE_USHORT;
-    if (c == 2) {
-      short[] tmp = data;
-      data = new short[(tmp.length / 2) * 3];
-      if (interleaved) {
-        for (int i=0; i<tmp.length/2; i++) {
-          data[i*3] = tmp[i*2];
-          data[i*3 + 1] = tmp[i*2 + 1];
-        }
-      }
-      else System.arraycopy(tmp, 0, data, 0, tmp.length);
-      c++;
-    }
     DataBuffer buffer = new DataBufferUShort(data, c * w * h);
     return constructImage(c, dataType, w, h, interleaved, false, buffer);
@@ -187 +163 @@
     if (c == 1) return makeImage(data, w, h);
     int dataType = DataBuffer.TYPE_INT;
-    if (c == 2) {
-      int[] tmp = data;
-      data = new int[(tmp.length / 2) * 3];
-      if (interleaved) {
-        for (int i=0; i<tmp.length/2; i++) {
-          data[i*3] = tmp[i*2];
-          data[i*3 + 1] = tmp[i*2 + 1];
-        }
-      }
-      else System.arraycopy(tmp, 0, data, 0, tmp.length);
-      c++;
-    }
     DataBuffer buffer = new DataBufferInt(data, c * w * h);
     return constructImage(c, dataType, w, h, interleaved, false, buffer);
@@ -219 +183 @@
     if (c == 1) return makeImage(data, w, h);
     int dataType = DataBuffer.TYPE_FLOAT;
-    if (c == 2) {
-      float[] tmp = data;
-      data = new float[(tmp.length / 2) * 3];
-      if (interleaved) {
-        for (int i=0; i<tmp.length/2; i++) {
-          data[i*3] = tmp[i*2];
-          data[i*3 + 1] = tmp[i*2 + 1];
-        }
-      }
-      else System.arraycopy(tmp, 0, data, 0, tmp.length);
-      c++;
-    }
     DataBuffer buffer = new DataBufferFloat(data, c * w * h);
     return constructImage(c, dataType, w, h, interleaved, false, buffer);
@@ -251 +203 @@
     if (c == 1) return makeImage(data, w, h);
     int dataType = DataBuffer.TYPE_DOUBLE;
-    if (c == 2) {
-      double[] tmp = data;
-      data = new double[(tmp.length / 2) * 3];
-      if (interleaved) {
-        for (int i=0; i<tmp.length/2; i++) {
-          data[i*3] = tmp[i*2];
-          data[i*3 + 1] = tmp[i*2 + 1];
-        }
-      }
-      else System.arraycopy(tmp, 0, data, 0, tmp.length);
-      c++;
-    }
     DataBuffer buffer = new DataBufferDouble(data, c * w * h);
     return constructImage(c, dataType, w, h, interleaved, false, buffer);
@@ -1885 +1825 @@
         break;
       case 2:
-        type = ColorSpace.CS_sRGB;
+        type = TwoChannelColorSpace.CS_2C;
         break;
       case 3:
@@ -1896 +1836 @@
         return null;
     }
-    return new ComponentColorModel(ColorSpace.getInstance(type), c == 4,
-      false, ColorModel.TRANSLUCENT, dataType);
+    return new ComponentColorModel(TwoChannelColorSpace.getInstance(type),
+      c == 4, false, ColorModel.TRANSLUCENT, dataType);
   }