changeset in /hg/icedtea: 2008-03-31 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Thu May 29 14:12:47 PDT 2008
changeset d434f6b487a4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d434f6b487a4
description:
2008-03-31 Lillian Angel <langel at redhat.com>
* Makefile.am: Added new patch.
* Makefile.in: Regenerated.
* patches/icedtea-jpegclasses.patch: New patch. Provides stubs for
com.sun.image.codec.jpeg classes.
diffstat:
4 files changed, 597 insertions(+), 1 deletion(-)
ChangeLog | 7
Makefile.am | 1
Makefile.in | 5
patches/icedtea-jpegclasses.patch | 585 +++++++++++++++++++++++++++++++++++++
diffs (truncated from 643 to 500 lines):
diff -r 40005c2a6281 -r d434f6b487a4 ChangeLog
--- a/ChangeLog Mon Mar 31 09:48:41 2008 -0400
+++ b/ChangeLog Mon Mar 31 17:08:28 2008 -0400
@@ -1,3 +1,10 @@ 2008-03-31 Lillian Angel <langel at redha
+2008-03-31 Lillian Angel <langel at redhat.com>
+
+ * Makefile.am: Added new patch.
+ * Makefile.in: Regenerated.
+ * patches/icedtea-jpegclasses.patch: New patch. Provides stubs for
+ com.sun.image.codec.jpeg classes.
+
2008-03-31 Lillian Angel <langel at redhat.com>
* configure.ac: Added checks for file and cpio.
diff -r 40005c2a6281 -r d434f6b487a4 Makefile.am
--- a/Makefile.am Mon Mar 31 09:48:41 2008 -0400
+++ b/Makefile.am Mon Mar 31 17:08:28 2008 -0400
@@ -277,6 +277,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
+ patches/icedtea-jpegclasses.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
diff -r 40005c2a6281 -r d434f6b487a4 Makefile.in
--- a/Makefile.in Mon Mar 31 09:48:41 2008 -0400
+++ b/Makefile.in Mon Mar 31 17:08:28 2008 -0400
@@ -84,6 +84,7 @@ CCDEPMODE = @CCDEPMODE@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHMOD = @CHMOD@
+CPIO = @CPIO@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -101,6 +102,7 @@ ENABLE_PLUGIN = @ENABLE_PLUGIN@
ENABLE_PLUGIN = @ENABLE_PLUGIN@
EXEEXT = @EXEEXT@
FASTJAR = @FASTJAR@
+FILE = @FILE@
FIND = @FIND@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@
@@ -381,7 +383,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
patches/icedtea-timerqueue.patch \
patches/icedtea-generated.patch patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch $(GCC_PATCH) \
+ patches/icedtea-print-lsb-release.patch \
+ patches/icedtea-jpegclasses.patch $(GCC_PATCH) \
$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
# Patch OpenJDK for plug replacements and ecj.
diff -r 40005c2a6281 -r d434f6b487a4 patches/icedtea-jpegclasses.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-jpegclasses.patch Mon Mar 31 17:08:28 2008 -0400
@@ -0,0 +1,585 @@
+diff -ruN oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java
+--- oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java 2008-03-31 15:41:36.000000000 -0400
+@@ -0,0 +1,51 @@
++/* ImageFormatException.java
++ Copyright (C) 2007 Matthew Flaschen
++
++ This file is part of IcedTea
++
++ IcedTea is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ IcedTea is distributed in the hope that it will be useful, but
++ WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with GNU Classpath; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ 02110-1301 USA.
++
++ Linking this library statically or dynamically with other modules is
++ making a combined work based on this library. Thus, the terms and
++ conditions of the GNU General Public License cover the whole
++ combination.
++
++ As a special exception, the copyright holders of this library give you
++ permission to link this library with independent modules to produce an
++ executable, regardless of the license terms of these independent
++ modules, and to copy and distribute the resulting executable under
++ terms of your choice, provided that you also meet, for each linked
++ independent module, the terms and conditions of the license of that
++ module. An independent module is a module which is not derived from
++ or based on this library. If you modify this library, you may extend
++ this exception to your version of the library, but you are not
++ obligated to do so. If you do not wish to do so, delete this
++ exception statement from your version. */
++
++package com.sun.image.codec.jpeg;
++
++public class ImageFormatException extends RuntimeException
++{
++ public ImageFormatException()
++ {
++ this("");
++ }
++
++ public ImageFormatException(String s)
++ {
++ super(s);
++ }
++}
+diff -ruN oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java
+--- oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java 2008-03-31 15:41:36.000000000 -0400
+@@ -0,0 +1,146 @@
++/* JPEGCodec.java --
++ Copyright (C) 2007 Free Software Foundation, Inc.
++ Copyright (C) 2007 Matthew Flaschen
++
++ This file is part of GNU Classpath.
++
++ GNU Classpath is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ GNU Classpath is distributed in the hope that it will be useful, but
++ WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with GNU Classpath; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ 02110-1301 USA.
++
++ Linking this library statically or dynamically with other modules is
++ making a combined work based on this library. Thus, the terms and
++ conditions of the GNU General Public License cover the whole
++ combination.
++
++ As a special exception, the copyright holders of this library give you
++ permission to link this library with independent modules to produce an
++ executable, regardless of the license terms of these independent
++ modules, and to copy and distribute the resulting executable under
++ terms of your choice, provided that you also meet, for each linked
++ independent module, the terms and conditions of the license of that
++ module. An independent module is a module which is not derived from
++ or based on this library. If you modify this library, you may extend
++ this exception to your version of the library, but you are not
++ obligated to do so. If you do not wish to do so, delete this
++ exception statement from your version. */
++
++package com.sun.image.codec.jpeg;
++
++import java.io.InputStream;
++import java.io.OutputStream;
++import java.io.IOException;
++
++import java.awt.image.BufferedImage;
++import java.awt.image.Raster;
++
++import javax.imageio.*;
++import javax.imageio.stream.*;
++import javax.imageio.plugins.jpeg.*;
++
++import java.util.Iterator;
++
++public class JPEGCodec
++{
++
++ public static JPEGImageDecoder createJPEGDecoder(InputStream is)
++ {
++ return new ImageIOJPEGImageDecoder(is);
++ }
++
++ public static JPEGImageEncoder createJPEGEncoder(OutputStream os)
++ {
++ return null;
++ }
++
++ public static JPEGImageDecoder createJPEGDecoder(InputStream src, JPEGDecodeParam jdp)
++ {
++ return null;
++ }
++
++ public static JPEGImageEncoder createJPEGEncoder(OutputStream dest, JPEGEncodeParam jep)
++ {
++ return null;
++ }
++
++ public static JPEGEncodeParam getDefaultJPEGEncodeParam(BufferedImage bi)
++ {
++ return null;
++ }
++
++ public static JPEGEncodeParam getDefaultJPEGEncodeParam(int numBands, int colorID)
++ {
++ return null;
++ }
++
++ public static JPEGEncodeParam getDefaultJPEGEncodeParam(JPEGDecodeParam jdp)
++ {
++ return null;
++ }
++
++ public static JPEGEncodeParam getDefaultJPEGEncodeParam(Raster ras, int colorID)
++ {
++ return null;
++ }
++
++
++ private static class ImageIOJPEGImageDecoder implements JPEGImageDecoder
++ {
++
++ private static final String JPGMime = "image/jpeg";
++
++ private ImageReader JPGReader;
++
++ private InputStream in;
++
++ private ImageIOJPEGImageDecoder (InputStream newIs)
++ {
++ in = newIs;
++
++ Iterator<ImageReader> JPGReaderIter = ImageIO.getImageReadersByMIMEType(JPGMime);
++ if(JPGReaderIter.hasNext())
++ {
++ JPGReader = JPGReaderIter.next();
++ }
++
++ JPGReader.setInput(new MemoryCacheImageInputStream(in));
++ }
++
++ public BufferedImage decodeAsBufferedImage() throws IOException, ImageFormatException
++ {
++ return JPGReader.read(0);
++ }
++
++ public Raster decodeAsRaster() throws IOException, ImageFormatException
++ {
++ return JPGReader.readRaster(0, null);
++ }
++
++ public InputStream getInputStream()
++ {
++ return in;
++ }
++
++ public JPEGDecodeParam getJPEGDecodeParam()
++ {
++ return null;
++ }
++
++ public void setJPEGDecodeParam(JPEGDecodeParam jdp)
++ {
++ return;
++ }
++
++ }
++}
+diff -ruN oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java
+--- oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java 2008-03-31 16:24:26.000000000 -0400
+@@ -0,0 +1,50 @@
++/* JPEGImageDecoder.java --
++ Copyright (C) 2007 Free Software Foundation, Inc.
++ Copyright (C) 2007 Matthew Flaschen
++
++ This file is part of GNU Classpath.
++
++ GNU Classpath is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ GNU Classpath is distributed in the hope that it will be useful, but
++ WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with GNU Classpath; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ 02110-1301 USA.
++
++ Linking this library statically or dynamically with other modules is
++ making a combined work based on this library. Thus, the terms and
++ conditions of the GNU General Public License cover the whole
++ combination.
++
++ As a special exception, the copyright holders of this library give you
++ permission to link this library with independent modules to produce an
++ executable, regardless of the license terms of these independent
++ modules, and to copy and distribute the resulting executable under
++ terms of your choice, provided that you also meet, for each linked
++ independent module, the terms and conditions of the license of that
++ module. An independent module is a module which is not derived from
++ or based on this library. If you modify this library, you may extend
++ this exception to your version of the library, but you are not
++ obligated to do so. If you do not wish to do so, delete this
++ exception statement from your version. */
++
++package com.sun.image.codec.jpeg;
++
++public interface JPEGDecodeParam
++{
++
++ public static final int COLOR_ID_UNKNOWN = 0;
++ public static final int COLOR_ID_RGBA = 1;
++ public static final int COLOR_ID_RGB = 2;
++ public static final int COLOR_ID_GRAY = 3;
++ public static final int COLOR_ID_YCbCrA = 4;
++ public static final int COLOR_ID_YCbCr = 5;
++}
+diff -ruN oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java
+--- oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java 2008-03-31 16:27:04.000000000 -0400
+@@ -0,0 +1,139 @@
++/* JPEGEncodeParam.java --
++ Copyright (C) 2007 Free Software Foundation, Inc.
++
++ This file is part of GNU Classpath.
++
++ GNU Classpath is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ GNU Classpath is distributed in the hope that it will be useful, but
++ WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with GNU Classpath; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ 02110-1301 USA.
++
++ Linking this library statically or dynamically with other modules is
++ making a combined work based on this library. Thus, the terms and
++ conditions of the GNU General Public License cover the whole
++ combination.
++
++ As a special exception, the copyright holders of this library give you
++ permission to link this library with independent modules to produce an
++ executable, regardless of the license terms of these independent
++ modules, and to copy and distribute the resulting executable under
++ terms of your choice, provided that you also meet, for each linked
++ independent module, the terms and conditions of the license of that
++ module. An independent module is a module which is not derived from
++ or based on this library. If you modify this library, you may extend
++ this exception to your version of the library, but you are not
++ obligated to do so. If you do not wish to do so, delete this
++ exception statement from your version. */
++
++package com.sun.image.codec.jpeg;
++
++public class JPEGEncodeParam
++{
++ public static final int COLOR_ID_UNKNOWN = 0;
++ public static final int COLOR_ID_RGBA = 1;
++ public static final int COLOR_ID_RGB = 2;
++ public static final int COLOR_ID_GRAY = 3;
++ public static final int COLOR_ID_YCbCrA = 4;
++ public static final int COLOR_ID_CMYK = 5;
++ public static final int COLOR_ID_YCbCr = 6;
++
++ public JPEGEncodeParam()
++ {
++ }
++
++ public void setQuality(float i, boolean b)
++ {
++ }
++
++ public void setQuality(int i, boolean b)
++ {
++ }
++
++ public JPEGEncodeParam clone()
++ {
++ return null;
++ }
++
++ public void setTableInfoValid(boolean b)
++ {
++ }
++
++ public void setImageInfoValid(boolean b)
++ {
++ }
++
++ public int getHorizontalSubsampling(int i)
++ {
++ return 0;
++ }
++
++ public int getVerticalSubsampling(int i)
++ {
++ return 0;
++ }
++
++ public int getWidth()
++ {
++ return 0;
++ }
++
++ public int getHeight()
++ {
++ return 0;
++ }
++
++ public int getDensityUnit()
++ {
++ return 0;
++ }
++
++ public int getXDensity()
++ {
++ return 0;
++ }
++
++ public int getYDensity()
++ {
++ return 0;
++ }
++
++ public int getRestartInterval()
++ {
++ return 0;
++ }
++
++ public JPEGQTable getQTable(int i)
++ {
++ return new JPEGQTable();
++ }
++
++ public void setDensityUnit(int i)
++ {
++ }
++
++ public void setXDensity(int i)
++ {
++ }
++
++ public void setYDensity(int i)
++ {
++ }
++
++ public void setRestartInterval(int i)
++ {
++ }
++
++ public void setQTable(int i, JPEGQTable jqt)
++ {
++ }
++}
+diff -ruN oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java
+--- oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java 2008-03-31 15:41:36.000000000 -0400
+@@ -0,0 +1,60 @@
++/* JPEGImageDecoder.java --
++ Copyright (C) 2007 Free Software Foundation, Inc.
++ Copyright (C) 2007 Matthew Flaschen
++
++ This file is part of GNU Classpath.
++
++ GNU Classpath is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
++
++ GNU Classpath is distributed in the hope that it will be useful, but
++ WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ General Public License for more details.
++
++ You should have received a copy of the GNU General Public License
++ along with GNU Classpath; see the file COPYING. If not, write to the
++ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ 02110-1301 USA.
++
++ Linking this library statically or dynamically with other modules is
++ making a combined work based on this library. Thus, the terms and
++ conditions of the GNU General Public License cover the whole
++ combination.
++
++ As a special exception, the copyright holders of this library give you
++ permission to link this library with independent modules to produce an
++ executable, regardless of the license terms of these independent
++ modules, and to copy and distribute the resulting executable under
++ terms of your choice, provided that you also meet, for each linked
++ independent module, the terms and conditions of the license of that
++ module. An independent module is a module which is not derived from
++ or based on this library. If you modify this library, you may extend
++ this exception to your version of the library, but you are not
++ obligated to do so. If you do not wish to do so, delete this
More information about the distro-pkg-dev
mailing list