You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2007/10/08 17:34:37 UTC
svn commit: r582848 -
/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
Author: jeremias
Date: Mon Oct 8 08:34:28 2007
New Revision: 582848
URL: http://svn.apache.org/viewvc?rev=582848&view=rev
Log:
Bugfix: Ignoring the alpha channel can lead to exceptions later.
Modified:
xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
Modified: xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java?rev=582848&r1=582847&r2=582848&view=diff
==============================================================================
--- xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java (original)
+++ xmlgraphics/commons/trunk/src/java/org/apache/xmlgraphics/image/codec/tiff/TIFFImageEncoder.java Mon Oct 8 08:34:28 2007
@@ -40,9 +40,9 @@
import java.io.RandomAccessFile;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
-import java.util.List;
import java.util.zip.Deflater;
import org.apache.xmlgraphics.image.codec.util.ImageEncodeParam;
@@ -671,12 +671,18 @@
com.sun.image.codec.jpeg.JPEGDecodeParam.COLOR_ID_GRAY;
break;
case TIFF_RGB:
- jpegColorID =
- com.sun.image.codec.jpeg.JPEGDecodeParam.COLOR_ID_RGB;
+ if (colorModel.hasAlpha()) {
+ jpegColorID = com.sun.image.codec.jpeg.JPEGDecodeParam.COLOR_ID_RGBA;
+ } else {
+ jpegColorID = com.sun.image.codec.jpeg.JPEGDecodeParam.COLOR_ID_RGB;
+ }
break;
case TIFF_YCBCR:
- jpegColorID =
- com.sun.image.codec.jpeg.JPEGDecodeParam.COLOR_ID_YCbCr;
+ if (colorModel.hasAlpha()) {
+ jpegColorID = com.sun.image.codec.jpeg.JPEGDecodeParam.COLOR_ID_YCbCrA;
+ } else {
+ jpegColorID = com.sun.image.codec.jpeg.JPEGDecodeParam.COLOR_ID_YCbCr;
+ }
break;
}
---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org