Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-04-30 00:00:01 -04:00
Code Issues Projects Releases Wiki Activity

TMI-19: Fix for broken JFIF raw RGB thumbnails

Browse Source
This commit is contained in:
Harald Kuhr
2012-04-16 22:55:32 +02:00
parent c16ffaca13
commit 0bdb68ea6f
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
+3 -4
View File
@@ -739,7 +739,7 @@ public class JPEGImageReader extends ImageReaderBase {
stream.readUnsignedShort(),
x = stream.readUnsignedByte(),
y = stream.readUnsignedByte(),
readFully(stream, x * y)
readFully(stream, x * y * 3)
);
}
@@ -928,9 +928,8 @@ public class JPEGImageReader extends ImageReaderBase {
// TODO: Candidate for util method
private BufferedImage readRawThumbnail(final byte[] thumbnail, final int size, final int offset, int w, int h) {
DataBufferByte buffer;WritableRaster raster;
buffer = new DataBufferByte(thumbnail, size, offset);
raster = Raster.createInterleavedRaster(buffer, w, h, w * 3, 3, new int[] {0, 1, 2}, null);
DataBufferByte buffer = new DataBufferByte(thumbnail, size, offset);
WritableRaster raster = Raster.createInterleavedRaster(buffer, w, h, w * 3, 3, new int[] {0, 1, 2}, null);
ColorModel cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB),false, false, Transparency.OPAQUE, DataBuffer.TYPE_BYTE);
return new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);