Added patch that switches from com.sun.* stuff for JPEGs to ImageIO. Fix for bug # 180339

Package-Manager: portage-2.1.2.7

4 files changed, 55 insertions, 10 deletions

diff --git a/dev-java/itext/ChangeLog b/dev-java/itext/ChangeLog
index 4782a68dd02f..54266c557e1b 100644
--- a/dev-java/itext/ChangeLog
+++ b/dev-java/itext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/itext
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.43 2007/05/30 14:38:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/ChangeLog,v 1.44 2007/05/30 17:58:38 wltjr Exp $
+
+  30 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +files/2.0-ImageIO.patch, itext-2.0.3.ebuild:
+  Added patch that switches from com.sun.* stuff for JPEGs to ImageIO. Fix for
+  bug # 180339
 
 *itext-2.0.3 (30 May 2007)
 
diff --git a/dev-java/itext/Manifest b/dev-java/itext/Manifest
index 4cd7ad53ea6e..278afff70183 100644
--- a/dev-java/itext/Manifest
+++ b/dev-java/itext/Manifest
@@ -1,3 +1,7 @@
+AUX 2.0-ImageIO.patch 1631 RMD160 3bd62ac57d09801bed507ae3d47db5842f836e9e SHA1 227b8dbd2a4bacbe368d48008d02f887c898a59c SHA256 c4c21b7e380b20cd6a5adcab26bb6f93b4244a1ed22b3665155fb838212402a8
+MD5 66b3c546fac4323a22293b6fedffc174 files/2.0-ImageIO.patch 1631
+RMD160 3bd62ac57d09801bed507ae3d47db5842f836e9e files/2.0-ImageIO.patch 1631
+SHA256 c4c21b7e380b20cd6a5adcab26bb6f93b4244a1ed22b3665155fb838212402a8 files/2.0-ImageIO.patch 1631
 AUX 2.0.2-compile_xml.patch 1528 RMD160 2981018d521814e3c866a70438be09b45bb75c90 SHA1 4edfb927ae9f54b28fc6ae8bcfba0daa5bd3de33 SHA256 770756a625ffe507cd9fc17bb8210dbc9efc97a67f7976fe46f9a72f8bbf95cb
 MD5 372e907da45af9a4e09b2c5af62c2f66 files/2.0.2-compile_xml.patch 1528
 RMD160 2981018d521814e3c866a70438be09b45bb75c90 files/2.0.2-compile_xml.patch 1528
@@ -19,14 +23,14 @@ EBUILD itext-2.0.2.ebuild 1685 RMD160 7ee5e7fea62ba288ead3cb927fd139e6f6e3dccd S
 MD5 b82944ee546388384809662b98aaf0a3 itext-2.0.2.ebuild 1685
 RMD160 7ee5e7fea62ba288ead3cb927fd139e6f6e3dccd itext-2.0.2.ebuild 1685
 SHA256 4d39130aa1a8aa763e10c3343abf43b301383c0b2afed75383e36cd45704710f itext-2.0.2.ebuild 1685
-EBUILD itext-2.0.3.ebuild 1766 RMD160 4a42142cc9194bf6fc7d186c4015926d25ed9144 SHA1 fd0a1036a5078a7fedb550f909e3780dfc33f0d8 SHA256 e5710ccde0662c4acc4e1b94b937502f088aafcc1774131d0b607dfc0a8cfbed
-MD5 f124e50a033db55d536a5d7e750ae908 itext-2.0.3.ebuild 1766
-RMD160 4a42142cc9194bf6fc7d186c4015926d25ed9144 itext-2.0.3.ebuild 1766
-SHA256 e5710ccde0662c4acc4e1b94b937502f088aafcc1774131d0b607dfc0a8cfbed itext-2.0.3.ebuild 1766
-MISC ChangeLog 7697 RMD160 7e8b365bd8bbecb52cde38bebd9acae15fbaa241 SHA1 80ac234d949e1c9886cd4efa653c28f445106966 SHA256 937be3e8bbef4d56c8d2f74a43f798222aa4cd99461d9f4c064c625b15e3535e
-MD5 ef9fc1559b4b4e290112a78f016f3d21 ChangeLog 7697
-RMD160 7e8b365bd8bbecb52cde38bebd9acae15fbaa241 ChangeLog 7697
-SHA256 937be3e8bbef4d56c8d2f74a43f798222aa4cd99461d9f4c064c625b15e3535e ChangeLog 7697
+EBUILD itext-2.0.3.ebuild 1804 RMD160 054fe63c58c6d96c17fec92ce5df317b970ab27b SHA1 c633f5f20d33bf427afc3023654ffcea56ded4e1 SHA256 58509094536eb2c6d7bda0c07603913aabc909e53ab4d38b735f3f0789fed52a
+MD5 1a05ceb1212b014521cd8b1cc2f5bc60 itext-2.0.3.ebuild 1804
+RMD160 054fe63c58c6d96c17fec92ce5df317b970ab27b itext-2.0.3.ebuild 1804
+SHA256 58509094536eb2c6d7bda0c07603913aabc909e53ab4d38b735f3f0789fed52a itext-2.0.3.ebuild 1804
+MISC ChangeLog 7897 RMD160 b88e4b0baa6f04a70011977a0bbda4c54eaf64f0 SHA1 cdb37134522f9527d919f9c7ad4d954737da5770 SHA256 e8e688c2e79e2d6846861679a7ff45e2818887c321c437d07328e06c9142f999
+MD5 8cb544f58be28da07083b9983e45cff4 ChangeLog 7897
+RMD160 b88e4b0baa6f04a70011977a0bbda4c54eaf64f0 ChangeLog 7897
+SHA256 e8e688c2e79e2d6846861679a7ff45e2818887c321c437d07328e06c9142f999 ChangeLog 7897
 MISC metadata.xml 755 RMD160 6d5a2821fe21dec8e0ee7b4ca1f4b664430cc799 SHA1 fcfe8df62909268540923da86a2af452126d5359 SHA256 9e0fc30b42f3ed3e82f53abbaede5a2bca9ea2db5f6115cf0a3b0d3cf57cf605
 MD5 220b53e6cd3c1cc6d9f735e4d06d4d4f metadata.xml 755
 RMD160 6d5a2821fe21dec8e0ee7b4ca1f4b664430cc799 metadata.xml 755
diff --git a/dev-java/itext/files/2.0-ImageIO.patch b/dev-java/itext/files/2.0-ImageIO.patch
new file mode 100644
index 000000000000..e37dc904dcf0
--- /dev/null
+++ b/dev-java/itext/files/2.0-ImageIO.patch
@@ -0,0 +1,35 @@
+--- ../PdfGraphics2D.java	2007-05-30 12:38:56.000000000 -0400
++++ com/lowagie/text/pdf/PdfGraphics2D.java	2007-05-30 13:07:37.000000000 -0400
+@@ -99,6 +99,7 @@
+ import java.util.Iterator;

+ import java.util.Map;

+ import java.util.Set;

++import javax.imageio.ImageIO;

+ 

+ import com.lowagie.text.pdf.internal.PolylineShape;

+ 

+@@ -185,12 +186,6 @@
+         super();

+         dg2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);

+         setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);

+-        try {

+-            Class.forName("com.sun.image.codec.jpeg.JPEGCodec");

+-        }

+-        catch (Throwable t) {

+-            convertImagesToJPEG = false;

+-        }

+         this.convertImagesToJPEG = convertImagesToJPEG;

+         this.jpegQuality = quality;

+         this.onlyShapes = onlyShapes;

+@@ -1354,10 +1349,7 @@
+                 g3.dispose();

+                 

+                 ByteArrayOutputStream baos = new ByteArrayOutputStream();

+-                com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(baos);

+-                com.sun.image.codec.jpeg.JPEGEncodeParam param = com.sun.image.codec.jpeg.JPEGCodec.getDefaultJPEGEncodeParam(scaled);

+-                param.setQuality(jpegQuality, true);

+-                encoder.encode(scaled, param);

++                ImageIO.write(scaled,"jpg",baos);

+                 scaled.flush();

+                 scaled = null;

+                 image = com.lowagie.text.Image.getInstance(baos.toByteArray());

diff --git a/dev-java/itext/itext-2.0.3.ebuild b/dev-java/itext/itext-2.0.3.ebuild
index 50d7c5d5449d..2141f7c8ec4f 100644
--- a/dev-java/itext/itext-2.0.3.ebuild
+++ b/dev-java/itext/itext-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.3.ebuild,v 1.1 2007/05/30 14:38:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/itext/itext-2.0.3.ebuild,v 1.2 2007/05/30 17:58:38 wltjr Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -41,6 +41,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/2.0.2-compile_xml.patch
 	epatch ${FILESDIR}/2.0.2-site_xml.patch
+	epatch ${FILESDIR}/2.0-ImageIO.patch
 	java-ant_bsfix_files ant/*.xml || die "failed to rewrite build xml files"
 
 	mkdir -p "${WORKDIR}/build/bin" || die