Context Navigation

Changeset 7143

Timestamp:

10/28/10 10:43:31 (9 years ago)

Author:

melissa

Message:

Fixed a handful of NPEs, AIOOBs, and leaking file handles.

Files:

-                      r7007
+                      r7143
     int width, int height, boolean littleEndian)
+  {
+    if (width == 1 && height == 1) {
+      for (int i=0; i<buf.length; i++) {
+        buf[i] = (byte) s[0];
+      }
+      return buf;
+    }
     // use linear interpolation to fill in missing components

r7007	r7143
109	109	public byte[][] get8BitLookupTable() {
110	110	FormatTools.assertId(currentId, true, 1);
111		return lut;
	111	return isRGB() ? null : lut;
112	112	}
113	113

r7007	r7143
306	306	TiffParser parser = new TiffParser(s);
307	307	String comment = parser.getComment();
	308	s.close();
308	309
309	310	comment = comment.replaceAll("\r\n", "\n");

-                      r7007
+                      r7143
     int[] colorMap = bayerPattern == 1 ? COLOR_MAP_1 : COLOR_MAP_2;
+    return ImageTools.interpolate(s, buf, colorMap, getSizeX(), getSizeY(),
+      isLittleEndian());
+    return ImageTools.interpolate(s, buf, colorMap, w, h, isLittleEndian());
+  }

-                      r6881
+                      r7143
     int width, int height, boolean littleEndian)
+  {
+    if (width == 1 && height == 1) {
+      for (int i=0; i<buf.length; i++) {
+        buf[i] = (byte) s[0];
+      }
+      return buf;
+    }
     // use linear interpolation to fill in missing components

r6881	r7143
109	109	public byte[][] get8BitLookupTable() {
110	110	FormatTools.assertId(currentId, true, 1);
111		return lut;
	111	return isRGB() ? null : lut;
112	112	}
113	113

r6983	r7143
306	306	TiffParser parser = new TiffParser(s);
307	307	String comment = parser.getComment();
	308	s.close();
308	309
309	310	comment = comment.replaceAll("\r\n", "\n");

-                      r6881
+                      r7143
     int[] colorMap = bayerPattern == 1 ? COLOR_MAP_1 : COLOR_MAP_2;
+    return ImageTools.interpolate(s, buf, colorMap, getSizeX(), getSizeY(),
+      isLittleEndian());
+    return ImageTools.interpolate(s, buf, colorMap, w, h, isLittleEndian());
+  }

Note: See TracChangeset for help on using the changeset viewer.