Commit 4e70902f authored by Luc Deschenaux's avatar Luc Deschenaux
Browse files

EyesisTiff: enable TIFF LZW lossless compression

parent 1dfca84a
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import loci.formats.tiff.IFDList;
import loci.formats.tiff.TiffParser;
import loci.formats.tiff.TiffParser;
import loci.formats.tiff.TiffRational;
import loci.formats.tiff.TiffRational;
import loci.formats.tiff.TiffSaver;
import loci.formats.tiff.TiffSaver;
import com.sun.media.imageio.plugins.tiff.BaselineTIFFTagSet;


public class EyesisTiff {
public class EyesisTiff {
//	private static org.apache.log4j.Logger log= Logger.getLogger(EyesisTiff.class); 
//	private static org.apache.log4j.Logger log= Logger.getLogger(EyesisTiff.class); 
@@ -175,7 +176,7 @@ public EyesisTiff(){
        ifd.putIFDValue(IFD.SOFTWARE, "Elphel Eyesis"); 
        ifd.putIFDValue(IFD.SOFTWARE, "Elphel Eyesis"); 
        ifd.putIFDValue(IFD.IMAGE_DESCRIPTION, description);
        ifd.putIFDValue(IFD.IMAGE_DESCRIPTION, description);
        // copy some other data?
        // copy some other data?
        ifd.putIFDValue(IFD.COMPRESSION, 1); //TiffCompression.UNCOMPRESSED);
        ifd.putIFDValue(IFD.COMPRESSION, BaselineTIFFTagSet.COMPRESSION_LZW);
        ifd.putIFDValue(IFD.PHOTOMETRIC_INTERPRETATION,2); // RGB
        ifd.putIFDValue(IFD.PHOTOMETRIC_INTERPRETATION,2); // RGB
        ifd.putIFDValue(IFD.EXTRA_SAMPLES,2); // 0 = Unspecified data  1 = Associated alpha data (with pre-multiplied color) 2 = Unassociated alpha data
        ifd.putIFDValue(IFD.EXTRA_SAMPLES,2); // 0 = Unspecified data  1 = Associated alpha data (with pre-multiplied color) 2 = Unassociated alpha data
//        int [] bpsArray={8,8,8,8};
//        int [] bpsArray={8,8,8,8};
@@ -257,7 +258,7 @@ public EyesisTiff(){
        ifd.putIFDValue(IFD.SOFTWARE, "Elphel Eyesis"); 
        ifd.putIFDValue(IFD.SOFTWARE, "Elphel Eyesis"); 
        ifd.putIFDValue(IFD.IMAGE_DESCRIPTION, description);
        ifd.putIFDValue(IFD.IMAGE_DESCRIPTION, description);
        // copy some other data?
        // copy some other data?
        ifd.putIFDValue(IFD.COMPRESSION, 1); //TiffCompression.UNCOMPRESSED);
        ifd.putIFDValue(IFD.COMPRESSION, BaselineTIFFTagSet.COMPRESSION_LZW);
        ifd.putIFDValue(IFD.PHOTOMETRIC_INTERPRETATION,2); // RGB
        ifd.putIFDValue(IFD.PHOTOMETRIC_INTERPRETATION,2); // RGB
        ifd.putIFDValue(IFD.EXTRA_SAMPLES,2); // extra bytes (over 3) meaning Unassociated alpha data
        ifd.putIFDValue(IFD.EXTRA_SAMPLES,2); // extra bytes (over 3) meaning Unassociated alpha data