/hg/icedtea6: Fix TCK regression with LCMS 2 by making setTagDat...

[andrew at icedtea.classpath.org]

changeset b79ee332e4f6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b79ee332e4f6
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Aug 28 23:12:48 2013 +0100

	Fix TCK regression with LCMS 2 by making setTagData not throw exceptions.

	2013-08-28  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am: Add new patch.
		* patches/lcms2-emulate_old_settagdata.patch:
		Emulate behaviour of old 6 setTagData function
		in not throwing exceptions.


diffstat:

 ChangeLog                                  |   7 ++++++
 Makefile.am                                |   3 +-
 patches/lcms2-emulate_old_settagdata.patch |  31 ++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletions(-)

diffs (62 lines):

diff -r ec5f676ee853 -r b79ee332e4f6 ChangeLog
--- a/ChangeLog	Wed Aug 28 20:34:26 2013 +0100
+++ b/ChangeLog	Wed Aug 28 23:12:48 2013 +0100
@@ -1,3 +1,10 @@
+2013-08-28  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/lcms2-emulate_old_settagdata.patch:
+	Emulate behaviour of old 6 setTagData function
+	in not throwing exceptions.
+
 2013-08-28  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* Makefile.am:
diff -r ec5f676ee853 -r b79ee332e4f6 Makefile.am
--- a/Makefile.am	Wed Aug 28 20:34:26 2013 +0100
+++ b/Makefile.am	Wed Aug 28 23:12:48 2013 +0100
@@ -457,7 +457,8 @@
 	patches/openjdk/lcms2/8009654-cmsnamed_stability.patch \
 	patches/openjdk/lcms2/7002766-parfait.patch \
 	patches/openjdk/lcms2/7042594-tck_failure.patch \
-	patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch
+	patches/openjdk/lcms2/8007927-improve_cmsallocprofilesequencedescription.patch \
+	patches/lcms2-emulate_old_settagdata.patch
 else
 LCMS_PATCHES = \
 	patches/lcms.patch
diff -r ec5f676ee853 -r b79ee332e4f6 patches/lcms2-emulate_old_settagdata.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/lcms2-emulate_old_settagdata.patch	Wed Aug 28 23:12:48 2013 +0100
@@ -0,0 +1,31 @@
+diff --git a/src/share/native/sun/java2d/cmm/lcms/LCMS.c b/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+--- openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
++++ openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+@@ -479,7 +479,7 @@
+     sig.j = tagSig;
+ 
+     if (JNU_IsNull(env, data)) {
+-        JNU_ThrowIllegalArgumentException(env, "Can not write tag data.");
++        J2dRlsTraceLn(J2D_TRACE_ERROR, "LCMS_setTagData: data == NULL");
+         return;
+     }
+ 
+@@ -488,7 +488,7 @@
+     dataArray = (*env)->GetByteArrayElements(env, data, 0);
+ 
+     if (dataArray == NULL) {
+-        JNU_ThrowIllegalArgumentException(env, "Can not write tag data.");
++        J2dRlsTraceLn(J2D_TRACE_ERROR, "LCMS_setTagData: dataArray == NULL");
+         return;
+     }
+ 
+@@ -501,7 +501,8 @@
+     (*env)->ReleaseByteArrayElements(env, data, dataArray, 0);
+ 
+     if (!status) {
+-        JNU_ThrowIllegalArgumentException(env, "Can not write tag data.");
++        J2dRlsTraceLn1(J2D_TRACE_ERROR, "LCMS_setTagData: status == %d",
++		       status);
+     }
+ }
+