changeset in /hg/icedtea6: 2008-03-31 Lillian Angel <langel at re...
Lillian Angel
langel at redhat.com
Mon Mar 31 20:21:40 PDT 2008
changeset 0fd2fbf0dfd0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0fd2fbf0dfd0
description:
2008-03-31 Lillian Angel <langel at redhat.com>
* patches/icedtea-jpegclasses.patch: Added new class.
diffstat:
2 files changed, 87 insertions(+), 21 deletions(-)
ChangeLog | 4 +
patches/icedtea-jpegclasses.patch | 104 +++++++++++++++++++++++++++++--------
diffs (168 lines):
diff -r d434f6b487a4 -r 0fd2fbf0dfd0 ChangeLog
--- a/ChangeLog Mon Mar 31 17:08:28 2008 -0400
+++ b/ChangeLog Mon Mar 31 23:19:32 2008 -0400
@@ -1,3 +1,7 @@ 2008-03-31 Lillian Angel <langel at redha
+2008-03-31 Lillian Angel <langel at redhat.com>
+
+ * patches/icedtea-jpegclasses.patch: Added new class.
+
2008-03-31 Lillian Angel <langel at redhat.com>
* Makefile.am: Added new patch.
diff -r d434f6b487a4 -r 0fd2fbf0dfd0 patches/icedtea-jpegclasses.patch
--- a/patches/icedtea-jpegclasses.patch Mon Mar 31 17:08:28 2008 -0400
+++ b/patches/icedtea-jpegclasses.patch Mon Mar 31 23:19:32 2008 -0400
@@ -1,6 +1,6 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
-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
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/ImageFormatException.java
+--- openjdkold/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 18:04:57.000000000 -0400
@@ -0,0 +1,51 @@
+/* ImageFormatException.java
+ Copyright (C) 2007 Matthew Flaschen
@@ -53,9 +53,9 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
+ 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
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGCodec.java
+--- openjdkold/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 18:04:57.000000000 -0400
@@ -0,0 +1,146 @@
+/* JPEGCodec.java --
+ Copyright (C) 2007 Free Software Foundation, Inc.
@@ -203,9 +203,9 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
+
+ }
+}
-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
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGDecodeParam.java
+--- openjdkold/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 18:04:57.000000000 -0400
@@ -0,0 +1,50 @@
+/* JPEGImageDecoder.java --
+ Copyright (C) 2007 Free Software Foundation, Inc.
@@ -257,9 +257,9 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
+ 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
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGEncodeParam.java
+--- openjdkold/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 18:04:57.000000000 -0400
@@ -0,0 +1,139 @@
+/* JPEGEncodeParam.java --
+ Copyright (C) 2007 Free Software Foundation, Inc.
@@ -400,9 +400,9 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
+ {
+ }
+}
-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
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageDecoder.java
+--- openjdkold/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 18:04:57.000000000 -0400
@@ -0,0 +1,60 @@
+/* JPEGImageDecoder.java --
+ Copyright (C) 2007 Free Software Foundation, Inc.
@@ -464,9 +464,9 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
+
+ public void setJPEGDecodeParam(JPEGDecodeParam jdp);
+}
-diff -ruN oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java
---- oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java 1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java 2008-03-31 15:41:36.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java
+--- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGImageEncoder.java 2008-03-31 18:04:57.000000000 -0400
@@ -0,0 +1,67 @@
+/* JPEGImageEncoder.java --
+ Copyright (C) 2007 Free Software Foundation, Inc.
@@ -535,9 +535,9 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
+ }
+
+}
-diff -ruN oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java
---- oldopenjdk6/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java 1969-12-31 19:00:00.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java 2008-03-31 15:41:36.000000000 -0400
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java
+--- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/JPEGQTable.java 2008-03-31 18:04:57.000000000 -0400
@@ -0,0 +1,44 @@
+/* JPEGQTable.java --
+ Copyright (C) 2007 Free Software Foundation, Inc.
@@ -583,3 +583,65 @@ diff -ruN oldopenjdk6/jdk/src/share/clas
+{
+
+}
+diff -ruN openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java
+--- openjdkold/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java 1969-12-31 19:00:00.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/image/codec/jpeg/TruncatedFileException.java 2008-03-31 19:38:37.000000000 -0400
+@@ -0,0 +1,58 @@
++/* TruncatedFileException.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;
++
++import java.awt.image.BufferedImage;
++
++public class TruncatedFileException extends RuntimeException
++{
++ public TruncatedFileException()
++ {
++ this("");
++ }
++
++ public TruncatedFileException(String s)
++ {
++ super(s);
++ }
++
++ public BufferedImage getBufferedImage()
++ {
++ return null;
++ }
++}
More information about the distro-pkg-dev
mailing list