rpms/tanukiwrapper/devel tanukiwrapper-jpeg.patch, NONE, 1.1 tanukiwrapper.spec, 1.6, 1.7 tanukiwrapper-nojpeg.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/tanukiwrapper/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30911

Modified Files:
	tanukiwrapper.spec 
Added Files:
	tanukiwrapper-jpeg.patch 
Removed Files:
	tanukiwrapper-nojpeg.patch 
Log Message:
Use portable JPEG code (from Anthony Green)

tanukiwrapper-jpeg.patch:
 ResourceManager.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE tanukiwrapper-jpeg.patch ---
--- wrapper_3.1.1_src/src/java/org/tanukisoftware/wrapper/resources/ResourceManager.java.orig	2004-07-16 15:29:11.000000000 +0100
+++ wrapper_3.1.1_src/src/java/org/tanukisoftware/wrapper/resources/ResourceManager.java	2005-08-25 13:34:22.000000000 +0100
@@ -60,8 +60,8 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.text.MessageFormat;
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageDecoder;
+import javax.imageio.stream.MemoryCacheImageInputStream;
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
 import java.io.IOException;
@@ -236,8 +236,7 @@
         {
             try
             {
-                JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder( is );
-                image = decoder.decodeAsBufferedImage();
+                image = ImageIO.read (new MemoryCacheImageInputStream(is));
             }
             catch ( IOException e )
             {


Index: tanukiwrapper.spec
===================================================================
RCS file: /cvs/dist/rpms/tanukiwrapper/devel/tanukiwrapper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tanukiwrapper.spec	18 Jul 2005 13:53:29 -0000	1.6
+++ tanukiwrapper.spec	25 Aug 2005 12:43:46 -0000	1.7
@@ -1,6 +1,6 @@
 %define name		tanukiwrapper
 %define version		3.1.1
-%define release		4jpp_2fc
+%define release		4jpp_3fc
 %define section		devel
 
 Summary:	Java Service Wrapper
@@ -8,7 +8,7 @@
 Source0:	wrapper_3.1.1_src-RHCLEAN.tar.bz2
 Patch0:		%{name}-%{version}.patch
 Patch1:		%{name}-nonative2ascii.patch
-Patch2:		%{name}-nojpeg.patch
+Patch2:		%{name}-jpeg.patch
 
 Name:		%{name}
 Version:	%{version}
@@ -150,6 +150,9 @@
 %{_datadir}/%{name}-%{version}/test
 
 %changelog
+* Thu Aug 25 2005 Gary Benson <gbenson at redhat.com> - 0:3.1.1-4jpp_3fc
+- Use portable JPEG code (from Anthony Green).
+
 * Mon Jul 18 2005 Gary Benson <gbenson at redhat.com> - 0:3.1.1-4jpp_2fc
 - Build on ia64, ppc64, s390 and s390x.
 


--- tanukiwrapper-nojpeg.patch DELETED ---