Changeset 7143
- Timestamp:
- 10/28/10 10:43:31 (9 years ago)
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.2/components/bio-formats/src/loci/formats/ImageTools.java
r7007 r7143 563 563 int width, int height, boolean littleEndian) 564 564 { 565 if (width == 1 && height == 1) { 566 for (int i=0; i<buf.length; i++) { 567 buf[i] = (byte) s[0]; 568 } 569 return buf; 570 } 565 571 // use linear interpolation to fill in missing components 566 572 -
branches/4.2/components/bio-formats/src/loci/formats/in/AVIReader.java
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 -
branches/4.2/components/bio-formats/src/loci/formats/in/ImprovisionTiffReader.java
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"); -
branches/4.2/components/bio-formats/src/loci/formats/in/MRWReader.java
r7007 r7143 142 142 int[] colorMap = bayerPattern == 1 ? COLOR_MAP_1 : COLOR_MAP_2; 143 143 144 return ImageTools.interpolate(s, buf, colorMap, getSizeX(), getSizeY(), 145 isLittleEndian()); 144 return ImageTools.interpolate(s, buf, colorMap, w, h, isLittleEndian()); 146 145 } 147 146 -
trunk/components/bio-formats/src/loci/formats/ImageTools.java
r6881 r7143 563 563 int width, int height, boolean littleEndian) 564 564 { 565 if (width == 1 && height == 1) { 566 for (int i=0; i<buf.length; i++) { 567 buf[i] = (byte) s[0]; 568 } 569 return buf; 570 } 565 571 // use linear interpolation to fill in missing components 566 572 -
trunk/components/bio-formats/src/loci/formats/in/AVIReader.java
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 -
trunk/components/bio-formats/src/loci/formats/in/ImprovisionTiffReader.java
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"); -
trunk/components/bio-formats/src/loci/formats/in/MRWReader.java
r6881 r7143 142 142 int[] colorMap = bayerPattern == 1 ? COLOR_MAP_1 : COLOR_MAP_2; 143 143 144 return ImageTools.interpolate(s, buf, colorMap, getSizeX(), getSizeY(), 145 isLittleEndian()); 144 return ImageTools.interpolate(s, buf, colorMap, w, h, isLittleEndian()); 146 145 } 147 146
Note: See TracChangeset
for help on using the changeset viewer.