rpms/jai-imageio-core/F-12 README-fedora.txt, NONE, 1.1 generate-tarball.sh, NONE, 1.1 jai-imageio-core-no-sun-classes.patch, NONE, 1.1 jai-imageio-core-remove-codeclib-plugins.patch, NONE, 1.1 jai-imageio-core-remove-imageio-services.patch, NONE, 1.1 jai-imageio-core-remove-jai-operations.patch, NONE, 1.1 jai-imageio-core-remove-jpeg2000-plugin.patch, NONE, 1.1 jai-imageio-core.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Adam Goode
agoode at fedoraproject.org
Thu Feb 18 19:54:56 UTC 2010
- Previous message: [pkgdb] smashteroid (un)retirement
- Next message: rpms/jai-imageio-core/F-13 README-fedora.txt, NONE, 1.1 generate-tarball.sh, NONE, 1.1 jai-imageio-core-no-sun-classes.patch, NONE, 1.1 jai-imageio-core-remove-codeclib-plugins.patch, NONE, 1.1 jai-imageio-core-remove-imageio-services.patch, NONE, 1.1 jai-imageio-core-remove-jai-operations.patch, NONE, 1.1 jai-imageio-core-remove-jpeg2000-plugin.patch, NONE, 1.1 jai-imageio-core.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: agoode
Update of /cvs/pkgs/rpms/jai-imageio-core/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31224
Modified Files:
.cvsignore sources
Added Files:
README-fedora.txt generate-tarball.sh
jai-imageio-core-no-sun-classes.patch
jai-imageio-core-remove-codeclib-plugins.patch
jai-imageio-core-remove-imageio-services.patch
jai-imageio-core-remove-jai-operations.patch
jai-imageio-core-remove-jpeg2000-plugin.patch
jai-imageio-core.spec
Log Message:
* Thu Feb 18 2010 Adam Goode <adam at spicenitz.org> - 1.2-0.4.20100217cvs
- First Fedora release
--- NEW FILE README-fedora.txt ---
jai-imageio-core README for Fedora
==================================
This package contains a CVS snapshot of jai-imageio-core from
https://jai-imageio.dev.java.net/.
Because of copyright issues, some functionality has been removed
for packaging in Fedora:
* JAI Image I/O Operations
* JPEG 2000 support
* codecLib (C implementation of plugins for JPEG, PNG, and TIFF)
Everything else should work, including java.nio based ImageIO streams,
and ImageIO readers/writers for:
* BMP
* GIF
* PCX
* PNM
* "Raw" (not digital camera RAW)
* TIFF (some formats unavailable because of missing codecLib)
* PCX
* WBMP
--- NEW FILE generate-tarball.sh ---
#!/bin/bash
set -e
if [ -z "$1" ]; then
echo "Please give your dev.java.net username on the command line."
exit 1
fi
if [ -z "$2" ]; then
echo "Please give the desired date on the command line."
exit 1
fi
CVSROOT=":pserver:${1}@cvs.dev.java.net:/cvs"
MODULE=jai-imageio-core
DIR=$MODULE-cvs$2-CLEANED
if [ -e $DIR ]; then
echo "Please remove $DIR and try again."
exit 1
fi
cvs -d $CVSROOT -f login
echo "Checking out"
cvs -z 3 -d $CVSROOT -f export -D $2 -d $DIR $MODULE
echo "Cleaning"
cd $DIR
rm -rf LICENSE-codecLibJIIO.txt src/share/classes/jj2000 src/share/jclib4jai www
cd ..
echo "Making tarball"
find $DIR -type d -print0 | xargs -0 touch -d $2 -c
tar cJf $DIR.tar.xz $DIR --owner 0 --group 0
tar czf $DIR.tar.gz $DIR --owner 0 --group 0
echo "Cleaning up"
rm -rf $DIR
echo "Results in $DIR.tar.xz and $DIR.tar.gz"
jai-imageio-core-no-sun-classes.patch:
PNMImageReader.java | 6 +++++-
PNMImageWriter.java | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
--- NEW FILE jai-imageio-core-no-sun-classes.patch ---
Index: src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageReader.java
===================================================================
RCS file: /cvs/jai-imageio-core/src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageReader.java,v
retrieving revision 1.1
diff -u -3 -p -r1.1 PNMImageReader.java
--- src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageReader.java 11 Feb 2005 05:01:40 -0000 1.1
+++ src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageReader.java 11 Nov 2009 20:17:16 -0000
@@ -72,6 +72,7 @@ import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.stream.ImageInputStream;
import java.io.*;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.StringTokenizer;
@@ -97,7 +98,10 @@ public class PNMImageReader extends Imag
static {
if (lineSeparator == null) {
String ls = (String)java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("line.separator"));
+ new PrivilegedAction(){
+ public Object run() {
+ return System.getProperty("line.separator");
+ }});
lineSeparator = ls.getBytes();
}
}
Index: src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageWriter.java
===================================================================
RCS file: /cvs/jai-imageio-core/src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageWriter.java,v
retrieving revision 1.1
diff -u -3 -p -r1.1 PNMImageWriter.java
--- src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageWriter.java 11 Feb 2005 05:01:40 -0000 1.1
+++ src/share/classes/com/sun/media/imageioimpl/plugins/pnm/PNMImageWriter.java 11 Nov 2009 20:17:16 -0000
@@ -60,6 +60,7 @@ import java.awt.image.WritableRaster;
import java.io.IOException;
+import java.security.PrivilegedAction;
import java.util.Iterator;
import javax.imageio.IIOImage;
@@ -109,7 +110,10 @@ public class PNMImageWriter extends Imag
static {
if (lineSeparator == null) {
String ls = (String)java.security.AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("line.separator"));
+ new PrivilegedAction(){
+ public Object run() {
+ return System.getProperty("line.separator");
+ }});
lineSeparator = ls.getBytes();
}
}
jai-imageio-core-remove-codeclib-plugins.patch:
build.xml | 7
src/share/classes/com/sun/media/imageioimpl/common/PackageUtil.java | 45
src/share/classes/com/sun/media/imageioimpl/plugins/clib/CLibImageReader.java | 766 --
src/share/classes/com/sun/media/imageioimpl/plugins/clib/CLibImageWriter.java | 818 --
src/share/classes/com/sun/media/imageioimpl/plugins/clib/I18N.java | 53
src/share/classes/com/sun/media/imageioimpl/plugins/clib/InputStreamAdapter.java | 94
src/share/classes/com/sun/media/imageioimpl/plugins/clib/OutputStreamAdapter.java | 78
src/share/classes/com/sun/media/imageioimpl/plugins/clib/properties | 16
src/share/classes/com/sun/media/imageioimpl/plugins/jpeg/CLibJPEGImageReader.java | 352 -
src/share/classes/com/sun/media/imageioimpl/plugins/jpeg/CLibJPEGImageReaderSpi.java | 169
src/share/classes/com/sun/media/imageioimpl/plugins/jpeg/CLibJPEGImageWriter.java | 347 -
src/share/classes/com/sun/media/imageioimpl/plugins/jpeg/CLibJPEGImageWriterSpi.java | 179
src/share/classes/com/sun/media/imageioimpl/plugins/jpeg/CLibJPEGMetadata.java | 1659 -----
src/share/classes/com/sun/media/imageioimpl/plugins/jpeg/I18N.java | 53
src/share/classes/com/sun/media/imageioimpl/plugins/jpeg/properties | 18
src/share/classes/com/sun/media/imageioimpl/plugins/png/CLibPNGImageReader.java | 249
src/share/classes/com/sun/media/imageioimpl/plugins/png/CLibPNGImageReaderSpi.java | 149
src/share/classes/com/sun/media/imageioimpl/plugins/png/CLibPNGImageWriter.java | 412 -
src/share/classes/com/sun/media/imageioimpl/plugins/png/CLibPNGImageWriterSpi.java | 173
src/share/classes/com/sun/media/imageioimpl/plugins/png/CLibPNGMetadata.java | 2908 ----------
src/share/classes/com/sun/media/imageioimpl/plugins/png/CLibPNGMetadataFormat.java | 520 -
src/share/classes/com/sun/media/imageioimpl/plugins/png/CLibPNGMetadataFormatResources.java | 241
src/share/classes/com/sun/media/imageioimpl/plugins/png/I18N.java | 53
src/share/classes/com/sun/media/imageioimpl/plugins/png/properties | 18
src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFCodecLibFaxDecompressor.java | 208
src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFCodecLibRLECompressor.java | 145
src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFCodecLibT4Compressor.java | 162
src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFCodecLibT6Compressor.java | 145
src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java | 52
src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java | 66
30 files changed, 19 insertions(+), 10136 deletions(-)
--- NEW FILE jai-imageio-core-remove-codeclib-plugins.patch ---
diff -urN jai-imageio-core-cvs20091111-CLEANED/build.xml zzx2/build.xml
--- jai-imageio-core-cvs20091111-CLEANED/build.xml 2007-08-27 17:43:29.000000000 -0400
+++ zzx2/build.xml 2009-11-11 15:32:11.379823605 -0500
@@ -517,7 +517,6 @@
<!-- Compile the java code from ${src} into ${classdir} -->
<javac sourcepath="" srcdir="${src}"
destdir="${classdir}"
- classpath="${clib}/clibwrapper_jiio.jar"
debug="${debugsetting}"
debuglevel="lines,source"
deprecation="off"
@@ -532,14 +531,14 @@
</copy>
</target>
- <target name="compile-debug" depends="init,clib-debug"
+ <target name="compile-debug" depends="init"
description="Builds all classes with debug compilation.">
<antcall target="debugcall">
<param name="targetname" value="compilation"/>
</antcall>
</target>
- <target name="compile-opt" depends="init,clib-opt"
+ <target name="compile-opt" depends="init"
description="Builds all classes with non-debug compilation.">
<antcall target="optcall">
<param name="targetname" value="compilation"/>
@@ -573,6 +572,8 @@
<!-- Create jai_imageio.jar. -->
<target name="jar-core" depends="compile,manifest">
+ <mkdir dir="${jardir}"/>
+
<jar jarfile="${jardir}/jai_imageio.jar"
manifest="${builddir}/Manifest" update="yes">
<fileset dir="${classdir}"/>
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/common/PackageUtil.java zzx2/src/share/classes/com/sun/media/imageioimpl/common/PackageUtil.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/common/PackageUtil.java 2006-03-31 14:43:38.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/imageioimpl/common/PackageUtil.java 2009-11-11 12:51:33.981635454 -0500
@@ -44,17 +44,8 @@
*/
package com.sun.media.imageioimpl.common;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import com.sun.medialib.codec.jiio.Util;
-
public class PackageUtil {
/**
- * Flag indicating whether codecLib is available.
- */
- private static boolean isCodecLibAvailable = false;
-
- /**
* Implementation version derived from Manifest.
*/
private static String version = "1.0";
@@ -73,16 +64,6 @@
* Set static flags.
*/
static {
- // Set codecLib flag.
- try {
- // Check for codecLib availability.
- isCodecLibAvailable = Util.isCodecLibAvailable();
- } catch(Throwable e) {
- // A Throwable is equivalent to unavailable. Throwable is used
- // in case an Error rather than an Exception is thrown.
- isCodecLibAvailable = false;
- }
-
// Set version and vendor strings.
try {
Class thisClass =
@@ -96,32 +77,6 @@
}
/**
- * Returns a <code>boolean</code> indicating whether codecLib is available.
- */
- public static final boolean isCodecLibAvailable() {
- // Retrieve value of system property here to allow this to be
- // modified dynamically.
- Boolean result = (Boolean)
- AccessController.doPrivileged(new PrivilegedAction() {
- public Object run() {
- String property = null;
- try {
- property =
- System.getProperty("com.sun.media.imageio.disableCodecLib");
- } catch(SecurityException se) {
- // Do nothing: leave 'property' null.
- }
- return (property != null &&
- property.equalsIgnoreCase("true")) ?
- Boolean.TRUE : Boolean.FALSE;
- }
- });
- boolean isCodecLibDisabled = result.booleanValue();
-
- return isCodecLibAvailable && !isCodecLibDisabled;
- }
-
- /**
* Return a version string for the package.
*/
public static final String getVersion() {
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/clib/CLibImageReader.java zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/clib/CLibImageReader.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/clib/CLibImageReader.java 2006-02-27 20:33:31.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/clib/CLibImageReader.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,766 +0,0 @@
-/*
- * $RCSfile: CLibImageReader.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.11 $
- * $Date: 2006/02/28 01:33:31 $
- * $State: Exp $
- */
-package com.sun.media.imageioimpl.plugins.clib;
-
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Transparency;
-import java.awt.color.ColorSpace;
-import java.awt.geom.AffineTransform;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.ComponentColorModel;
-import java.awt.image.ComponentSampleModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferUShort;
-import java.awt.image.IndexColorModel;
-import java.awt.image.MultiPixelPackedSampleModel;
-import java.awt.image.PixelInterleavedSampleModel;
-import java.awt.image.Raster;
-import java.awt.image.SampleModel;
-import java.awt.image.WritableRaster;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import javax.imageio.IIOException;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageReadParam;
-import javax.imageio.ImageTypeSpecifier;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.spi.ImageReaderSpi;
-import javax.imageio.stream.ImageInputStream;
-import com.sun.medialib.codec.jiio.Constants;
-import com.sun.medialib.codec.jiio.mediaLibImage;
-
-// XXX Need to verify compliance of all methods with ImageReader specificaiton.
-public abstract class CLibImageReader extends ImageReader {
- // The current image index.
- private int currIndex = -1;
-
- // The position of the byte after the last byte read so far.
- private long highWaterMark = Long.MIN_VALUE;
[...9954 lines suppressed...]
- System.arraycopy(data, dataOffset, image, imageOffset,
- bytesPerRow);
- dataOffset += lineStride;
- imageOffset += bytesPerRow;
- }
- }
-
- // Attempt the codecLib encoder.
- com.sun.medialib.codec.g4fax.Encoder clibEncoder =
- (com.sun.medialib.codec.g4fax.Encoder)encoder;
- //System.out.println("Using codecLib G4 encoder");
-
- // Set encoding flags.
- int encodingFlags = inverseFill ?
- com.sun.medialib.codec.g4fax.Constants.G4FAX_LSB2MSB : 0;
-
- int result =
- com.sun.medialib.codec.g4fax.Constants.G4FAX_FAILURE;
- try {
- if(DEBUG) {
- System.out.println("Using MediaLib G4 encoder");
- }
- result = clibEncoder.encode(compData, image, width, height,
- encodingFlags);
- } catch(Throwable t) {
- if(DEBUG) {
- System.out.println("MediaLib G4 encoder failed: "+t);
- }
- // XXX Should write a warning to listeners here.
- result = com.sun.medialib.codec.g4fax.Constants.G4FAX_FAILURE;
- }
-
- // If the codecLib encoder failed, try the superclass.
- if(result == com.sun.medialib.codec.g4fax.Constants.G4FAX_FAILURE) {
- if(DEBUG) {
- System.out.println("Falling back to Java G4 encoder");
- }
- result = super.encodeT6(data, lineStride, colOffset,
- width, height, compData);
- }
-
- return result;
- }
-}
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java 2007-12-19 15:17:02.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageReader.java 2009-11-11 12:52:31.490697135 -0500
@@ -1227,56 +1227,16 @@
}
} else if (compression ==
BaselineTIFFTagSet.COMPRESSION_CCITT_T_6) {
-
- // Try to create the codecLib decompressor.
- if(PackageUtil.isCodecLibAvailable()) {
- try {
- this.decompressor =
- new TIFFCodecLibFaxDecompressor(compression);
- if(DEBUG) {
- System.out.println
- ("Using codecLib T.6 decompressor");
- }
- } catch (RuntimeException re) {
- if(DEBUG) {
- System.out.println(re);
- }
- }
- }
-
- // Fall back to the Java decompressor.
- if (this.decompressor == null) {
- if(DEBUG) {
- System.out.println("Using Java T.6 decompressor");
- }
- this.decompressor = new TIFFFaxDecompressor();
+ if (DEBUG) {
+ System.out.println("Using Java T.6 decompressor");
}
+ this.decompressor = new TIFFFaxDecompressor();
} else if (compression ==
BaselineTIFFTagSet.COMPRESSION_CCITT_T_4) {
-
- if(PackageUtil.isCodecLibAvailable()) {
- // Try to create the codecLib decompressor.
- try {
- this.decompressor =
- new TIFFCodecLibFaxDecompressor(compression);
- if(DEBUG) {
- System.out.println
- ("Using codecLib T.4 decompressor");
- }
- } catch (RuntimeException re) {
- if(DEBUG) {
- System.out.println(re);
- }
- }
- }
-
- // Fall back to the Java decompressor.
- if (this.decompressor == null) {
- if(DEBUG) {
- System.out.println("Using Java T.4 decompressor");
- }
- this.decompressor = new TIFFFaxDecompressor();
+ if (DEBUG) {
+ System.out.println("Using Java T.4 decompressor");
}
+ this.decompressor = new TIFFFaxDecompressor();
} else if (compression ==
BaselineTIFFTagSet.COMPRESSION_CCITT_RLE) {
this.decompressor = new TIFFFaxDecompressor();
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java 2007-08-31 20:27:20.000000000 -0400
+++ zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/tiff/TIFFImageWriter.java 2009-11-11 12:53:17.688759818 -0500
@@ -841,25 +841,9 @@
if (compressor == null) {
if (compression == BaselineTIFFTagSet.COMPRESSION_CCITT_RLE) {
- if(PackageUtil.isCodecLibAvailable()) {
- try {
- compressor = new TIFFCodecLibRLECompressor();
- if(DEBUG) {
- System.out.println
- ("Using codecLib RLE compressor");
- }
- } catch(RuntimeException e) {
- if(DEBUG) {
- System.out.println(e);
- }
- }
- }
-
- if(compressor == null) {
- compressor = new TIFFRLECompressor();
- if(DEBUG) {
- System.out.println("Using Java RLE compressor");
- }
+ compressor = new TIFFRLECompressor();
+ if (DEBUG) {
+ System.out.println("Using Java RLE compressor");
}
if (!forcePhotometricInterpretation) {
@@ -868,25 +852,9 @@
}
} else if (compression ==
BaselineTIFFTagSet.COMPRESSION_CCITT_T_4) {
- if(PackageUtil.isCodecLibAvailable()) {
- try {
- compressor = new TIFFCodecLibT4Compressor();
- if(DEBUG) {
- System.out.println
- ("Using codecLib T.4 compressor");
- }
- } catch(RuntimeException e) {
- if(DEBUG) {
- System.out.println(e);
- }
- }
- }
-
- if(compressor == null) {
- compressor = new TIFFT4Compressor();
- if(DEBUG) {
- System.out.println("Using Java T.4 compressor");
- }
+ compressor = new TIFFT4Compressor();
+ if (DEBUG) {
+ System.out.println("Using Java T.4 compressor");
}
if (!forcePhotometricInterpretation) {
@@ -895,25 +863,9 @@
}
} else if (compression ==
BaselineTIFFTagSet.COMPRESSION_CCITT_T_6) {
- if(PackageUtil.isCodecLibAvailable()) {
- try {
- compressor = new TIFFCodecLibT6Compressor();
- if(DEBUG) {
- System.out.println
- ("Using codecLib T.6 compressor");
- }
- } catch(RuntimeException e) {
- if(DEBUG) {
- System.out.println(e);
- }
- }
- }
-
- if(compressor == null) {
- compressor = new TIFFT6Compressor();
- if(DEBUG) {
- System.out.println("Using Java T.6 compressor");
- }
+ compressor = new TIFFT6Compressor();
+ if (DEBUG) {
+ System.out.println("Using Java T.6 compressor");
}
if (!forcePhotometricInterpretation) {
jai-imageio-core-remove-imageio-services.patch:
javax.imageio.spi.ImageReaderSpi | 4 ----
javax.imageio.spi.ImageWriterSpi | 4 ----
2 files changed, 8 deletions(-)
--- NEW FILE jai-imageio-core-remove-imageio-services.patch ---
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/services/javax.imageio.spi.ImageReaderSpi zzx2/src/share/services/javax.imageio.spi.ImageReaderSpi
--- jai-imageio-core-cvs20091111-CLEANED/src/share/services/javax.imageio.spi.ImageReaderSpi 2007-09-04 20:21:08.000000000 -0400
+++ zzx2/src/share/services/javax.imageio.spi.ImageReaderSpi 2009-11-11 13:32:55.845761231 -0500
@@ -44,10 +44,6 @@
#
# --- JAI-Image I/O ImageReader plug-ins ---
#
-com.sun.media.imageioimpl.plugins.jpeg.CLibJPEGImageReaderSpi
-com.sun.media.imageioimpl.plugins.png.CLibPNGImageReaderSpi
-com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReaderSpi
-com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageReaderCodecLibSpi
com.sun.media.imageioimpl.plugins.wbmp.WBMPImageReaderSpi
com.sun.media.imageioimpl.plugins.bmp.BMPImageReaderSpi
com.sun.media.imageioimpl.plugins.pcx.PCXImageReaderSpi
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/services/javax.imageio.spi.ImageWriterSpi zzx2/src/share/services/javax.imageio.spi.ImageWriterSpi
--- jai-imageio-core-cvs20091111-CLEANED/src/share/services/javax.imageio.spi.ImageWriterSpi 2007-09-04 20:21:08.000000000 -0400
+++ zzx2/src/share/services/javax.imageio.spi.ImageWriterSpi 2009-11-11 13:32:59.627697630 -0500
@@ -44,10 +44,6 @@
#
# --- JAI-Image I/O ImageWriter plug-ins ---
#
-com.sun.media.imageioimpl.plugins.jpeg.CLibJPEGImageWriterSpi
-com.sun.media.imageioimpl.plugins.png.CLibPNGImageWriterSpi
-com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriterSpi
-com.sun.media.imageioimpl.plugins.jpeg2000.J2KImageWriterCodecLibSpi
com.sun.media.imageioimpl.plugins.wbmp.WBMPImageWriterSpi
com.sun.media.imageioimpl.plugins.bmp.BMPImageWriterSpi
com.sun.media.imageioimpl.plugins.gif.GIFImageWriterSpi
jai-imageio-core-remove-jai-operations.patch:
src/share/services/javax.media.jai.OperationRegistrySpi | 47
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/I18N.java | 53
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageIOCollectionImage.java | 74
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadCIF.java | 168 -
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadCRIF.java | 434 ---
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadOpImage.java | 914 ------
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadWriteSpi.java | 142 -
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageWriteCIF.java | 296 --
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageWriteCRIF.java | 663 ----
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/PixelReplacementImage.java | 293 --
zzx2/src/share/classes/com/sun/media/jai/imageioimpl/properties | 26
zzx2/src/share/classes/com/sun/media/jai/operator/I18N.java | 54
zzx2/src/share/classes/com/sun/media/jai/operator/ImageReadDescriptor.java | 1100 --------
zzx2/src/share/classes/com/sun/media/jai/operator/ImageWriteDescriptor.java | 1375 ----------
zzx2/src/share/classes/com/sun/media/jai/operator/PrintProps.java | 85
zzx2/src/share/classes/com/sun/media/jai/operator/package.html | 52
zzx2/src/share/classes/com/sun/media/jai/operator/properties | 60
17 files changed, 5836 deletions(-)
--- NEW FILE jai-imageio-core-remove-jai-operations.patch ---
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/imageioimpl/I18N.java zzx2/src/share/classes/com/sun/media/jai/imageioimpl/I18N.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/imageioimpl/I18N.java 2005-02-11 00:01:54.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/jai/imageioimpl/I18N.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,53 +0,0 @@
-/*
- * $RCSfile: I18N.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.1 $
- * $Date: 2005/02/11 05:01:54 $
- * $State: Exp $
- */
-package com.sun.media.jai.imageioimpl;
-
-import com.sun.media.imageioimpl.common.I18NImpl;
-
-final class I18N extends I18NImpl {
- static String getString(String key) {
- return getString("com.sun.media.jai.imageioimpl.I18N", key);
- }
-}
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/imageioimpl/ImageIOCollectionImage.java zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageIOCollectionImage.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/imageioimpl/ImageIOCollectionImage.java 2005-02-11 00:01:54.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageIOCollectionImage.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,74 +0,0 @@
-/*
- * $RCSfile: ImageIOCollectionImage.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.1 $
- * $Date: 2005/02/11 05:01:54 $
- * $State: Exp $
- */
-package com.sun.media.jai.imageioimpl;
-
-import java.util.ArrayList;
-import javax.media.jai.CollectionImage;
-
-/**
- * A <code>CollectionImage</code> to be used as the return value from
- * <code>ImageReadCIF.create()</code> and <code>ImageWriteCIF.create()</code>.
- * The <code>imageCollection</code> instance variable is a <code>List</code>.
- */
-class ImageIOCollectionImage extends CollectionImage {
- /**
- * Creates an <code>ImageIOCollectionImage</code> with the specified
- * capacity.
- *
- * @exception IllegalArgumentException if <code>capacity</code> is
- * not positive.
- */
- ImageIOCollectionImage(int capacity) {
- super();
-
- if(capacity <= 0) {
- // No message as this is not at the API level and it is
- // the unique exception.
- throw new IllegalArgumentException();
- }
-
- imageCollection = new ArrayList(capacity);
- }
-}
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadCIF.java zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadCIF.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadCIF.java 2005-02-11 00:01:54.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/jai/imageioimpl/ImageReadCIF.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,168 +0,0 @@
-/*
- * $RCSfile: ImageReadCIF.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.1 $
- * $Date: 2005/02/11 05:01:54 $
- * $State: Exp $
- */
-package com.sun.media.jai.imageioimpl;
-
-import java.awt.Dimension;
-import java.awt.RenderingHints;
-import java.awt.image.renderable.ParameterBlock;
-import java.util.ArrayList;
-import java.util.List;
-import javax.imageio.ImageReader;
-import javax.media.jai.CollectionImage;
-import javax.media.jai.CollectionImageFactory;
-import javax.media.jai.CollectionOp;
-import javax.media.jai.JAI;
-import javax.media.jai.PlanarImage;
-import com.sun.media.jai.operator.ImageReadDescriptor;
-
-public class ImageReadCIF implements CollectionImageFactory {
[...5505 lines suppressed...]
-/*
- * $RCSfile: PrintProps.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.1 $
- * $Date: 2005/02/11 05:01:57 $
- * $State: Exp $
- */
-package com.sun.media.jai.operator;
-
-import java.util.Collection;
-import java.util.Iterator;
-import javax.media.jai.PropertySource;
-
-final class PrintProps {
- static final void print(PropertySource ps) {
- String[] propNames = ps.getPropertyNames();
- if(propNames != null) {
- System.out.println("\nPROPERTIES OF "+
- ps.getClass().getName()+"@"+
- ps.hashCode()+":\n");
- for(int j = 0; j < propNames.length; j++) {
- Object propVal = ps.getProperty(propNames[j]);
- if(propVal == null) {
- System.out.println(propNames[j]+" is NULL.");
- } else if(propVal == java.awt.Image.UndefinedProperty) {
- System.out.println(propNames[j]+" is UNDEFINED.");
- } else {
- System.out.println(propNames[j]+" = "+
- propVal.getClass().getName()+"@"+
- propVal.hashCode());
- }
- }
- } else {
- System.out.println("\n"+ps+" has no properties.");
- }
- System.out.println("\n");
-
- if(ps instanceof Collection) {
- Iterator iter = ((Collection)ps).iterator();
- while(iter.hasNext()) {
- Object nextElement = iter.next();
- if(nextElement instanceof PropertySource) {
- print((PropertySource)nextElement);
- }
- }
- }
- }
-}
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/operator/properties zzx2/src/share/classes/com/sun/media/jai/operator/properties
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/jai/operator/properties 2005-02-11 00:01:57.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/jai/operator/properties 1969-12-31 19:00:00.000000000 -0500
@@ -1,60 +0,0 @@
-#
-# $RCSfile: properties,v $
-#
-# Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Use is subject to license terms.
-#
-# $Revision: 1.1 $
-# $Date: 2005/02/11 05:01:57 $
-# $State: Exp $
-#
-# Internationalization file for com.sun.media.jai.operator
-
-DescriptorVersion=1.0
-
-ImageReadDescriptor0=Reads an image using the Java Image I/O Framework.
-ImageReadDescriptor1=The input source.
-ImageReadDescriptor2=The index or indices of the image(s) to read.
-ImageReadDescriptor3=Whether metadata should be read if available.
-ImageReadDescriptor4=Whether thumbnails should be read if available.
-ImageReadDescriptor5=Whether to verify the validity of the input source.
-ImageReadDescriptor6=EventListeners to be registered with the ImageReader.
-ImageReadDescriptor7=The Locale for the ImageReader to use.
-ImageReadDescriptor8=Java Image I/O read parameter instance.
-ImageReadDescriptor9=Java Image I/O reader instance.
-ImageReadDescriptor10=Image index parameter must be non-negative.
-ImageReadDescriptor11=does not exist.
-ImageReadDescriptor12=is not readable.
-ImageReadDescriptor13=has its read-half shut down.
-ImageReadDescriptor14=is closed.
-ImageReadDescriptor15=is not bound to an address.
-ImageReadDescriptor16=is not connected.
-
-ImageWriteDescriptor0=Writes an image using the Java Image I/O Framework.
-ImageWriteDescriptor1=The output destination.
-ImageWriteDescriptor2=The format name of the output.
-ImageWriteDescriptor3=Whether to use image metadata properties as fallbacks.
-ImageWriteDescriptor4=Whether to transcode metadata before writing.
-ImageWriteDescriptor5=Whether to verify the validity of the output destination.
-ImageWriteDescriptor6=Whether to allow pixel replacement in the output image.
-ImageWriteDescriptor7=The tile size of the output image.
-ImageWriteDescriptor8=Stream metadata to write to the output.
-ImageWriteDescriptor9=Image metadata to write to the output.
-ImageWriteDescriptor10=Thumbnails to write to the output.
-ImageWriteDescriptor11=EventListeners to be registered with the ImageWriter.
-ImageWriteDescriptor12=The Locale for the ImageWriter to use.
-ImageWriteDescriptor13=Java Image I/O write parameter instance.
-ImageWriteDescriptor14=Java Image I/O writer instance.
-ImageWriteDescriptor15=exists but is not writable.
-ImageWriteDescriptor16=does not exist and cannot be created.
-ImageWriteDescriptor17=encountered IOException during createNewFile:
-ImageWriteDescriptor18=access denied by security manager:
-ImageWriteDescriptor19=has its write-half shut down.
-ImageWriteDescriptor20=is closed.
-ImageWriteDescriptor21=is not bound to an address.
-ImageWriteDescriptor22=is not connected.
-ImageWriteDescriptor23=Non-positive tile dimension specified.
-ImageWriteDescriptor24=No RenderedImages in the source Collection.
-ImageWriteDescriptor25=There is more than one RenderedImage in the source \
-Collection and the supplied ImageWriter cannot write sequences.
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/services/javax.imageio.spi.ImageReaderSpi zzx2/src/share/services/javax.imageio.spi.ImageReaderSpi
--- jai-imageio-core-cvs20091111-CLEANED/src/share/services/javax.media.jai.OperationRegistrySpi 2005-02-11 00:02:44.000000000 -0500
+++ zzx2/src/share/services/javax.media.jai.OperationRegistrySpi 1969-12-31 19:00:00.000000000 -0500
@@ -1,47 +0,0 @@
-#
-# $RCSfile: javax.media.jai.OperationRegistrySpi,v $
-#
-#
-# Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# - Redistribution of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# - Redistribution in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in
-# the documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of Sun Microsystems, Inc. or the names of
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# This software is provided "AS IS," without a warranty of any
-# kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
-# WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
-# EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
-# NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
-# USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
-# DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
-# ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
-# CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
-# REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
-# INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGES.
-#
-# You acknowledge that this software is not designed or intended for
-# use in the design, construction, operation or maintenance of any
-# nuclear facility.
-#
-# $Revision: 1.1 $
-# $Date: 2005/02/11 05:02:44 $
-# $State: Exp $
-#
-# --- JAI-Image I/O operations registration ---
-#
-com.sun.media.jai.imageioimpl.ImageReadWriteSpi
jai-imageio-core-remove-jpeg2000-plugin.patch:
imageio/plugins/jpeg2000/J2KImageReadParam.java | 147 -
imageio/plugins/jpeg2000/J2KImageWriteParam.java | 462 ---
imageio/plugins/jpeg2000/package.html | 768 ------
imageioimpl/plugins/jpeg2000/BitsPerComponentBox.java | 91
imageioimpl/plugins/jpeg2000/Box.java | 643 -----
imageioimpl/plugins/jpeg2000/ChannelDefinitionBox.java | 272 --
imageioimpl/plugins/jpeg2000/ColorSpecificationBox.java | 222 -
imageioimpl/plugins/jpeg2000/ComponentMappingBox.java | 181 -
imageioimpl/plugins/jpeg2000/DataEntryURLBox.java | 154 -
imageioimpl/plugins/jpeg2000/FileTypeBox.java | 174 -
imageioimpl/plugins/jpeg2000/HeaderBox.java | 218 -
imageioimpl/plugins/jpeg2000/I18N.java | 53
imageioimpl/plugins/jpeg2000/IISRandomAccessIO.java | 235 -
imageioimpl/plugins/jpeg2000/ImageInputStreamWrapper.java | 104
imageioimpl/plugins/jpeg2000/J2KImageReadParamJava.java | 166 -
imageioimpl/plugins/jpeg2000/J2KImageReader.java | 601 -----
imageioimpl/plugins/jpeg2000/J2KImageReaderCodecLib.java | 471 ---
imageioimpl/plugins/jpeg2000/J2KImageReaderCodecLibSpi.java | 171 -
imageioimpl/plugins/jpeg2000/J2KImageReaderResources.java | 56
imageioimpl/plugins/jpeg2000/J2KImageReaderSpi.java | 167 -
imageioimpl/plugins/jpeg2000/J2KImageWriteParamJava.java | 1297 -----------
imageioimpl/plugins/jpeg2000/J2KImageWriter.java | 514 ----
imageioimpl/plugins/jpeg2000/J2KImageWriterCodecLib.java | 879 -------
imageioimpl/plugins/jpeg2000/J2KImageWriterCodecLibSpi.java | 144 -
imageioimpl/plugins/jpeg2000/J2KImageWriterResources.java | 57
imageioimpl/plugins/jpeg2000/J2KImageWriterSpi.java | 139 -
imageioimpl/plugins/jpeg2000/J2KMetadata.java | 1051 --------
imageioimpl/plugins/jpeg2000/J2KMetadataFormat.java | 351 --
imageioimpl/plugins/jpeg2000/J2KMetadataFormatResources.java | 280 --
imageioimpl/plugins/jpeg2000/J2KReadState.java | 1042 --------
imageioimpl/plugins/jpeg2000/J2KRenderedImage.java | 129 -
imageioimpl/plugins/jpeg2000/J2KRenderedImageCodecLib.java | 1020 --------
imageioimpl/plugins/jpeg2000/MediaLibAccessor.java | 1222 ----------
imageioimpl/plugins/jpeg2000/PaletteBox.java | 267 --
imageioimpl/plugins/jpeg2000/RenderedImageSrc.java | 1035 --------
imageioimpl/plugins/jpeg2000/ResolutionBox.java | 229 -
imageioimpl/plugins/jpeg2000/SignatureBox.java | 93
imageioimpl/plugins/jpeg2000/UUIDBox.java | 130 -
imageioimpl/plugins/jpeg2000/UUIDListBox.java | 157 -
imageioimpl/plugins/jpeg2000/XMLBox.java | 116
imageioimpl/plugins/jpeg2000/properties | 59
41 files changed, 15567 deletions(-)
--- NEW FILE jai-imageio-core-remove-jpeg2000-plugin.patch ---
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageReadParam.java zzx2/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageReadParam.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageReadParam.java 2006-09-29 15:25:32.000000000 -0400
+++ zzx2/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageReadParam.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,147 +0,0 @@
-/*
- * $RCSfile: J2KImageReadParam.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.3 $
- * $Date: 2006/09/29 19:25:32 $
- * $State: Exp $
- */
-package com.sun.media.imageio.plugins.jpeg2000;
-
-import javax.imageio.ImageReadParam;
-
-/**
- * A subclass of <code>ImageReadParam</code> for reading images in
- * the JPEG 2000 format.
- *
- * <p>The decoding parameters for JPEG 2000 are listed below:
- *
- * <p><table border=1>
- * <caption><b>JPEG 2000 Plugin Decoding Parameters</b></caption>
- * <tr><th>Parameter Name</th> <th>Description</th></tr>
- * <tr>
- * <td>decodingRate</td>
- * <td>Specifies the decoding rate in bits per pixel (bpp) where the
- * number of pixels is related to the image's original size (Note:
- * this parameter is not affected by <code>resolution</code>).
- * The default is <code>Double.MAX_VALUE</code>.
- * It means decoding with the encoding rate.
- * </td>
- * </tr>
- * <tr>
- * <td>resolution</td>
- * <td>Specifies the resolution level wanted for the decoded image
- * (0 means the lowest available resolution, the resolution
- * level gives an image with the original dimension). If the given index
- * is greater than the number of available resolution levels of the
- * compressed image, the decoded image has the lowest available
- * resolution (among all tile-components). This parameter affects only
- * the inverse wavelet transform and not the number of bytes read by the
- * codestream parser, which depends only on <code>decodingRate</code>.
- * The default value, -1, means to use the resolution level at encoding.
- * </td>
- * </tr>
- * </table>
- */
-public class J2KImageReadParam extends ImageReadParam {
- /** Specifies the decoding rate in bits per pixel (bpp) where the
- * number of pixels is related to the image's original size
- * (Note: this number is not affected by <code>resolution</code>).
- */
- private double decodingRate = Double.MAX_VALUE;
-
- /** Specifies the resolution level wanted for the decoded image
- * (0 means the lowest available resolution, the resolution
- * level gives an image with the original dimension). If the given index
- * is greater than the number of available resolution levels of the
- * compressed image, the decoded image has the lowest available
- * resolution (among all tile-components). This parameter
- * affects only the inverse wavelet transform but not the number
- * of bytes read by the codestream parser, which
- * depends only on <code>decodingRate</code>.
- */
- private int resolution = -1;
-
- /** Constructs a default instance of <code>J2KImageReadParam</code>. */
- public J2KImageReadParam() {
- super();
- }
-
- /**
- * Sets <code>decodingRate</code>.
- *
- * @param rate the decoding rate in bits per pixel.
- * @see #getDecodingRate()
- */
- public void setDecodingRate(double rate) {
- this.decodingRate = rate;
- }
-
- /**
- * Gets <code>decodingRate</code>.
- *
- * @return the decoding rate in bits per pixel.
- * @see #setDecodingRate(double)
- */
- public double getDecodingRate() {
- return decodingRate;
- }
-
- /**
- * Sets <code>resolution</code>.
- *
- * @param resolution the resolution level with 0 being
- * the lowest available.
- * @see #getResolution()
- */
- public void setResolution(int resolution) {
- this.resolution = Math.max(resolution, -1);
- }
-
- /**
- * Gets <code>resolution</code>.
- *
- * @return the resolution level with 0 being
- * the lowest available.
- * @see #setResolution(int)
- */
- public int getResolution() {
- return resolution;
- }
-}
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageWriteParam.java zzx2/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageWriteParam.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageWriteParam.java 2006-09-20 19:23:30.000000000 -0400
+++ zzx2/src/share/classes/com/sun/media/imageio/plugins/jpeg2000/J2KImageWriteParam.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,462 +0,0 @@
-/*
- * $RCSfile: J2KImageWriteParam.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.2 $
- * $Date: 2006/09/20 23:23:30 $
- * $State: Exp $
- */
[...15332 lines suppressed...]
- super(8 + data.length, 0x756c7374, data);
- }
-
- /** Constructs a <code>UUIDListBox</code> based on the provided
- * <code>org.w3c.dom.Node</code>.
- */
- public UUIDListBox(Node node) throws IIOInvalidTreeException {
- super(node);
- NodeList children = node.getChildNodes();
- int index = 0;
-
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
-
- if ("NumberUUID".equals(child.getNodeName())) {
- num = (short)Box.getShortElementValue(child);
- uuids = new byte[num][];
- }
-
- }
-
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
-
- if ("UUID".equals(child.getNodeName()) && index < num) {
- uuids[index++] = Box.getByteArrayElementValue(child);
- }
- }
- }
-
- /** Parses the data elements from the provided content data array. */
- protected void parse(byte[] data) {
- num = (short)(((data[0] & 0xFF) << 8) | (data[1] & 0xFF));
-
- uuids = new byte[num][];
- int pos = 2;
- for (int i = 0; i < num; i++) {
- uuids[i] = new byte[16];
- System.arraycopy(data, pos, uuids[i], 0, 16);
- pos += 16;
- }
- }
-
- /** Creates an <code>IIOMetadataNode</code> from this UUID list
- * box. The format of this node is defined in the XML dtd and xsd
- * for the JP2 image file.
- */
- public IIOMetadataNode getNativeNode() {
- IIOMetadataNode node = new IIOMetadataNode(Box.getName(getType()));
- setDefaultAttributes(node);
-
- IIOMetadataNode child = new IIOMetadataNode("NumberUUID");
- child.setUserObject(new Short(num));
- child.setNodeValue("" + num);
- node.appendChild(child);
-
- for (int i = 0; i < num; i++) {
- child = new IIOMetadataNode("UUID");
- child.setUserObject(uuids[i]);
- child.setNodeValue(ImageUtil.convertObjectToString(uuids[i]));
- node.appendChild(child);
- }
-
- return node;
- }
-
- protected void compose() {
- if (data != null)
- return;
- data = new byte[2 + num * 16];
-
- data[0] = (byte)(num >> 8);
- data[1] = (byte)(num & 0xFF);
-
- for (int i = 0, pos = 2; i < num; i++) {
- System.arraycopy(uuids[i], 0, data, pos, 16);
- pos += 16;
- }
- }
-}
diff -urN jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/jpeg2000/XMLBox.java zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/jpeg2000/XMLBox.java
--- jai-imageio-core-cvs20091111-CLEANED/src/share/classes/com/sun/media/imageioimpl/plugins/jpeg2000/XMLBox.java 2005-02-11 00:01:37.000000000 -0500
+++ zzx2/src/share/classes/com/sun/media/imageioimpl/plugins/jpeg2000/XMLBox.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,116 +0,0 @@
-/*
- * $RCSfile: XMLBox.java,v $
- *
- *
- * Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistribution of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * This software is provided "AS IS," without a warranty of any
- * kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
- * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
- * EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL
- * NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
- * USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
- * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR
- * ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
- * CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
- * REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
- * INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- * You acknowledge that this software is not designed or intended for
- * use in the design, construction, operation or maintenance of any
- * nuclear facility.
- *
- * $Revision: 1.1 $
- * $Date: 2005/02/11 05:01:37 $
- * $State: Exp $
- */
-package com.sun.media.imageioimpl.plugins.jpeg2000;
-
-import javax.imageio.metadata.IIOInvalidTreeException;
-import javax.imageio.metadata.IIOMetadataNode;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/** This class is defined to represent a XML box of JPEG JP2
- * file format. This type of box has a length, a type of "xml ". Its
- * content is a text string of a XML instance.
- */
-public class XMLBox extends Box {
- /** Cache the element names for this box's xml definition */
- private static String[] elementNames = {"Content"};
-
- /** This method will be called by the getNativeNodeForSimpleBox of the
- * class Box to get the element names.
- */
- public static String[] getElementNames() {
- return elementNames;
- }
-
- /** Create a Box from its content. */
- public XMLBox(byte[] data) {
- super(8 + data.length, 0x786D6C20, data);
- }
-
- /** Constructs a <code>UUIDListBox</code> based on the provided
- * <code>org.w3c.dom.Node</code>.
- */
- public XMLBox(Node node) throws IIOInvalidTreeException {
- super(node);
- NodeList children = node.getChildNodes();
-
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- String name = child.getNodeName();
-
- if ("Content".equals(name)) {
- String value = child.getNodeValue();
- if (value != null)
- data = value.getBytes();
- else if (child instanceof IIOMetadataNode) {
- value = (String)((IIOMetadataNode)child).getUserObject();
- if (value != null)
- data = value.getBytes();
- }
- }
- }
- }
-
- /** Creates an <code>IIOMetadataNode</code> from this XML
- * box. The format of this node is defined in the XML dtd and xsd
- * for the JP2 image file.
- */
- public IIOMetadataNode getNativeNode() {
- try {
- IIOMetadataNode node = new IIOMetadataNode(Box.getName(getType()));
- setDefaultAttributes(node);
- IIOMetadataNode child = new IIOMetadataNode("Content");
- String value = null;
- if (data != null)
- value = new String(data);
- child.setUserObject(value);
- child.setNodeValue(value);
- node.appendChild(child);
- return node;
- } catch (Exception e) {
- throw new IllegalArgumentException(I18N.getString("Box0"));
- }
- }
-}
--- NEW FILE jai-imageio-core.spec ---
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
%global cvs_ver 20100217
Name: jai-imageio-core
Version: 1.2
Release: 0.4.%{cvs_ver}cvs%{?dist}
Summary: Core Java Advanced Imaging Image I/O Tools API
Group: System Environment/Libraries
License: BSD
URL: https://jai-imageio.dev.java.net/
Source0: jai-imageio-core-cvs%{cvs_ver}-CLEANED.tar.xz
Source1: README-fedora.txt
# jai-imageio-core contains code under a restrictive licence that we
# cannot ship. This script will download and generate a tarball from
# CVS. Unfortunately, a login is required to download from CVS and
# there are no source tarballs.
#
# Register at:
# https://www.dev.java.net/servlets/Join
#
# Then, run:
# ./generate-tarball.sh USERNAME DATE
Source2: generate-tarball.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel libgcj-devel ant jpackage-utils
BuildRequires: recode
Requires: java jpackage-utils
Patch0: jai-imageio-core-remove-imageio-services.patch
Patch1: jai-imageio-core-remove-codeclib-plugins.patch
Patch2: jai-imageio-core-remove-jai-operations.patch
Patch3: jai-imageio-core-remove-jpeg2000-plugin.patch
Patch4: jai-imageio-core-no-sun-classes.patch
%if %{with_gcj}
BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%else
BuildArch: noarch
%endif
%description
This package contains the core Java Advanced Imaging Image I/O Tools API,
minus JPEG 2000, JAI Image I/O operations, and the C-based codecLib.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
BuildArch: noarch
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q -n jai-imageio-core-cvs%{cvs_ver}-CLEANED
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
# remove unbuildable items
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
# remove use of sun.*
# https://jai-imageio-core.dev.java.net/issues/show_bug.cgi?id=186
%patch4 -p0
# fix latin-1 documentation
recode latin1..utf-8 COPYRIGHT.txt
# install our documentation
cp -av %{SOURCE1} .
%build
# note: BUILD_TARGET is pretty much ignored, but we need it
# to know where the built files will be located
ant -DBUILD_TARGET=linux-i586 jar-opt docs-jcp
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -av build/linux-i586/opt/lib/ext/jai_imageio.jar $RPM_BUILD_ROOT%{_javadir}/jai_imageio-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
cp -av build/linux-i586/javadocs/docs-jcp/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif
%if %{with_gcj}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%if %{with_gcj}
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc LICENSE.txt COPYRIGHT.txt README-fedora.txt
%{_javadir}/*.jar
%if %{with_gcj}
%{_libdir}/gcj/%{name}
%endif
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
* Thu Feb 18 2010 Adam Goode <adam at spicenitz.org> - 1.2-0.4.20100217cvs
- First Fedora release
* Wed Feb 3 2010 Adam Goode <adam at spicenitz.org> - 1.2-0.3.20100202cvs
- Update generate-tarball.sh to canonicalize owner/group and date
* Mon Jan 11 2010 Adam Goode <adam at spicenitz.org> - 1.2-0.2.20100111cvs
- Add generate-tarball.sh
* Wed Nov 11 2009 Adam Goode <adam at spicenitz.org> - 1.2-0.1.20091111cvs
- Initial release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jai-imageio-core/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 16 Feb 2010 03:55:38 -0000 1.1
+++ .cvsignore 18 Feb 2010 19:54:56 -0000 1.2
@@ -0,0 +1 @@
+jai-imageio-core-cvs20100217-CLEANED.tar.xz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jai-imageio-core/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 16 Feb 2010 03:55:38 -0000 1.1
+++ sources 18 Feb 2010 19:54:56 -0000 1.2
@@ -0,0 +1 @@
+e727b641d3fe0cb43de7b4873f1ef0df jai-imageio-core-cvs20100217-CLEANED.tar.xz
- Previous message: [pkgdb] smashteroid (un)retirement
- Next message: rpms/jai-imageio-core/F-13 README-fedora.txt, NONE, 1.1 generate-tarball.sh, NONE, 1.1 jai-imageio-core-no-sun-classes.patch, NONE, 1.1 jai-imageio-core-remove-codeclib-plugins.patch, NONE, 1.1 jai-imageio-core-remove-imageio-services.patch, NONE, 1.1 jai-imageio-core-remove-jai-operations.patch, NONE, 1.1 jai-imageio-core-remove-jpeg2000-plugin.patch, NONE, 1.1 jai-imageio-core.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list