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

TMI-CR2: Commented out lossless JPEG.

Browse Source
This commit is contained in:
Harald Kuhr 2014-10-15 12:26:29 +02:00
parent 923598636e
commit 7728a912b1
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReader.java
View File

@ -36,7 +36,6 @@ import com.twelvemonkeys.imageio.metadata.exif.EXIFReader;
import com.twelvemonkeys.imageio.metadata.exif.TIFF; import com.twelvemonkeys.imageio.metadata.exif.TIFF;
import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegment; import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegment;
import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil; import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil;
import com.twelvemonkeys.imageio.plugins.jpeg.LosslessJPEGDecoder;
import com.twelvemonkeys.imageio.stream.SubImageInputStream; import com.twelvemonkeys.imageio.stream.SubImageInputStream;
import javax.imageio.IIOException; import javax.imageio.IIOException;
@ -50,11 +49,12 @@ import java.awt.color.ColorSpace;
import java.awt.image.*; import java.awt.image.*;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
//import com.twelvemonkeys.imageio.plugins.jpeg.LosslessJPEGDecoder;
/** /**
* Canon CR2 RAW ImageReader. * Canon CR2 RAW ImageReader.
* <p/> * <p/>
@ -443,24 +443,24 @@ public final class CR2ImageReader extends ImageReaderBase {
int height = getHeight(0); int height = getHeight(0);
imageInput.seek(stripOffsets); imageInput.seek(stripOffsets);
byte[] data = new LosslessJPEGDecoder().decompress(new SubImageInputStream(imageInput, stripByteCounts), null); // byte[] data = new LosslessJPEGDecoder().decompress(new SubImageInputStream(imageInput, stripByteCounts), null);
//
// TODO: We really have 2 bytes/sample // // TODO: We really have 2 bytes/sample
short[] data2 = new short[data.length / 2]; // short[] data2 = new short[data.length / 2];
ByteBuffer wrap = ByteBuffer.wrap(data); // ByteBuffer wrap = ByteBuffer.wrap(data);
wrap.asShortBuffer().get(data2); // wrap.asShortBuffer().get(data2);
//
System.err.println("data.length: " + data2.length); // System.err.println("data.length: " + data2.length);
System.err.println("width x height: " + width * height); // System.err.println("width x height: " + width * height);
//
DataBuffer dataBuffer = new DataBufferUShort(data2, data2.length); // DataBuffer dataBuffer = new DataBufferUShort(data2, data2.length);
WritableRaster raster = Raster.createInterleavedRaster(dataBuffer, width, height, width, 1, new int[] {0}, null); // WritableRaster raster = Raster.createInterleavedRaster(dataBuffer, width, height, width, 1, new int[] {0}, null);
ColorModel cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_GRAY), false, false, Transparency.OPAQUE, raster.getTransferType()); // ColorModel cm = new ComponentColorModel(ColorSpace.getInstance(ColorSpace.CS_GRAY), false, false, Transparency.OPAQUE, raster.getTransferType());
BufferedImage image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null); // BufferedImage image = new BufferedImage(cm, raster, cm.isAlphaPremultiplied(), null);
//
System.err.println("image: " + image); // System.err.println("image: " + image);
//
return image; // return image;
} }
return null; return null;