/hg/icedtea6: S5082756: Image I/O plug-ins set metadata boolean ...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu Sep 8 02:42:42 PDT 2011
changeset daabd8a14b5e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=daabd8a14b5e
author: ptisnovs
date: Thu Sep 08 11:42:33 2011 +0200
S5082756: Image I/O plug-ins set metadata boolean attributes to
"true" or "false"
diffstat:
ChangeLog | 8 +
Makefile.am | 3 +-
NEWS | 1 +
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch | 352 ++++++++++
4 files changed, 363 insertions(+), 1 deletions(-)
diffs (403 lines):
diff -r fc183654bed3 -r daabd8a14b5e ChangeLog
--- a/ChangeLog Mon Sep 05 12:45:12 2011 +0200
+++ b/ChangeLog Thu Sep 08 11:42:33 2011 +0200
@@ -1,3 +1,11 @@
+2011-09-06 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * NEWS: updated with backport
+ * patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch:
+ Backport of 5082756: Image I/O plug-ins set metadata
+ boolean attributes to "true" or "false"
+
2011-09-05 Xerxes RÃ¥nby <xerxes at zafena.se>
JamVM
diff -r fc183654bed3 -r daabd8a14b5e Makefile.am
--- a/Makefile.am Mon Sep 05 12:45:12 2011 +0200
+++ b/Makefile.am Thu Sep 08 11:42:33 2011 +0200
@@ -377,7 +377,8 @@
patches/pr696-zero-fast_aldc-hs20.patch \
patches/openjdk/6806261-BigDecimal_longValueExact_throws_NPE.patch \
patches/openjdk/6371401-BigInteger.shift_throws_StackOverflowError.patch \
- patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch
+ patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
+ patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r fc183654bed3 -r daabd8a14b5e NEWS
--- a/NEWS Mon Sep 05 12:45:12 2011 +0200
+++ b/NEWS Thu Sep 08 11:42:33 2011 +0200
@@ -369,6 +369,7 @@
- S6806261: BigDecimal.longValueExact() method throws NullPointerException
- S6371401: java.math.BigInteger.shift(Integer.MIN_VALUE) throws StackOverflowError
- S6826104, RH730015: Getting a NullPointer exception when clicked on Application & Toolkit Modal dialog
+ - S5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false"
* Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools"
* CACAO
- CA149: Used wrong class loader.
diff -r fc183654bed3 -r daabd8a14b5e patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch Thu Sep 08 11:42:33 2011 +0200
@@ -0,0 +1,360 @@
+# HG changeset patch
+# User bae
+# Date 1231854912 -10800
+# Node ID 80fb12052ae4c62ec98e28003d9f3994ca5ca6a3
+# Parent 91bc016862c466cb6141a2199f4089a48ee9b283
+5082756: Image I/O plug-ins set metadata boolean attributes to "true" or "false"
+Reviewed-by: igor, prr
+Contributed-by: Martin von Gagern <martin.vgagern at gmx.net>
+
+diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java Mon Jan 12 16:02:47 2009 -0800
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java Tue Jan 13 16:55:12 2009 +0300
+@@ -153,7 +153,7 @@
+ node.setAttribute("imageWidth", Integer.toString(imageWidth));
+ node.setAttribute("imageHeight", Integer.toString(imageHeight));
+ node.setAttribute("interlaceFlag",
+- interlaceFlag ? "true" : "false");
++ interlaceFlag ? "TRUE" : "FALSE");
+ root.appendChild(node);
+
+ // Local color table
+@@ -185,9 +185,9 @@
+ node.setAttribute("disposalMethod",
+ disposalMethodNames[disposalMethod]);
+ node.setAttribute("userInputFlag",
+- userInputFlag ? "true" : "false");
++ userInputFlag ? "TRUE" : "FALSE");
+ node.setAttribute("transparentColorFlag",
+- transparentColorFlag ? "true" : "false");
++ transparentColorFlag ? "TRUE" : "FALSE");
+ node.setAttribute("delayTime",
+ Integer.toString(delayTime));
+ node.setAttribute("transparentColorIndex",
+diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java Mon Jan 12 16:02:47 2009 -0800
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java Tue Jan 13 16:55:12 2009 +0300
+@@ -158,13 +158,10 @@
+ }
+ }
+ String value = attr.getNodeValue();
+- // XXX Should be able to use equals() here instead of
+- // equalsIgnoreCase() but some boolean attributes are incorrectly
+- // set to "true" or "false" by the J2SE core metadata classes
+- // getAsTree() method (which are duplicated above). See bug 5082756.
+- if (value.equalsIgnoreCase("TRUE")) {
++ // Allow lower case booleans for backward compatibility, #5082756
++ if (value.equals("TRUE") || value.equals("true")) {
+ return true;
+- } else if (value.equalsIgnoreCase("FALSE")) {
++ } else if (value.equals("FALSE") || value.equals("false")) {
+ return false;
+ } else {
+ fatal(node, "Attribute " + name + " must be 'TRUE' or 'FALSE'!");
+diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java Mon Jan 12 16:02:47 2009 -0800
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java Tue Jan 13 16:55:12 2009 +0300
+@@ -202,7 +202,7 @@
+ compression_node.appendChild(node);
+
+ node = new IIOMetadataNode("Lossless");
+- node.setAttribute("value", "true");
++ node.setAttribute("value", "TRUE");
+ compression_node.appendChild(node);
+
+ // NumProgressiveScans not in stream
+diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Mon Jan 12 16:02:47 2009 -0800
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java Tue Jan 13 16:55:12 2009 +0300
+@@ -955,7 +955,7 @@
+
+ // Lossless - false
+ IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
+- lossless.setAttribute("value", "false");
++ lossless.setAttribute("value", "FALSE");
+ compression.appendChild(lossless);
+
+ // NumProgressiveScans - count sos segments
+diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Mon Jan 12 16:02:47 2009 -0800
++++ openjdk/jdk/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java Tue Jan 13 16:55:12 2009 +0300
+@@ -600,7 +600,7 @@
+ IIOMetadataNode iTXt_node = new IIOMetadataNode("iTXtEntry");
+ iTXt_node.setAttribute("keyword", iTXt_keyword.get(i));
+ iTXt_node.setAttribute("compressionFlag",
+- iTXt_compressionFlag.get(i) ? "1" : "0");
++ iTXt_compressionFlag.get(i) ? "TRUE" : "FALSE");
+ iTXt_node.setAttribute("compressionMethod",
+ iTXt_compressionMethod.get(i).toString());
+ iTXt_node.setAttribute("languageTag",
+@@ -832,7 +832,7 @@
+ }
+
+ node = new IIOMetadataNode("BlackIsZero");
+- node.setAttribute("value", "true");
++ node.setAttribute("value", "TRUE");
+ chroma_node.appendChild(node);
+
+ if (PLTE_present) {
+@@ -894,7 +894,7 @@
+ compression_node.appendChild(node);
+
+ node = new IIOMetadataNode("Lossless");
+- node.setAttribute("value", "true");
++ node.setAttribute("value", "TRUE");
+ compression_node.appendChild(node);
+
+ node = new IIOMetadataNode("NumProgressiveScans");
+@@ -1162,12 +1162,13 @@
+ }
+ }
+ String value = attr.getNodeValue();
+- if (value.equals("true")) {
++ // Allow lower case booleans for backward compatibility, #5082756
++ if (value.equals("TRUE") || value.equals("true")) {
+ return true;
+- } else if (value.equals("false")) {
++ } else if (value.equals("FALSE") || value.equals("false")) {
+ return false;
+ } else {
+- fatal(node, "Attribute " + name + " must be 'true' or 'false'!");
++ fatal(node, "Attribute " + name + " must be 'TRUE' or 'FALSE'!");
+ return false;
+ }
+ }
+diff -r 91bc016862c4 -r 80fb12052ae4 src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java
+--- openjdk.orig/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java Mon Jan 12 16:02:47 2009 -0800
++++ openjdk/jdk/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java Tue Jan 13 16:55:12 2009 +0300
+@@ -242,8 +242,12 @@
+
+ /**
+ * A constant returned by <code>getAttributeDataType</code>
+- * indicating that the value of an attribute is one of 'true' or
+- * 'false'.
++ * indicating that the value of an attribute is one of the boolean
++ * values 'true' or 'false'.
++ * Attribute values of type DATATYPE_BOOLEAN should be marked as
++ * enumerations, and the permitted values should be the string
++ * literal values "TRUE" or "FALSE", although a plugin may also
++ * recognise lower or mixed case equivalents.
+ */
+ int DATATYPE_BOOLEAN = 1;
+
+diff -r 91bc016862c4 -r 80fb12052ae4 test/javax/imageio/metadata/BooleanAttributes.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/javax/imageio/metadata/BooleanAttributes.java Tue Jan 13 16:55:12 2009 +0300
+@@ -0,0 +1,202 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation. Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code 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
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/**
++ * @test
++ * @bug 5082756
++ * @summary ensure that boolean attributes follow ( "TRUE" | "FALSE" )
++ * including correct (i.e. upper) case
++ *
++ * @run main BooleanAttributes
++ */
++
++import java.awt.image.BufferedImage;
++import java.io.ByteArrayInputStream;
++import java.io.ByteArrayOutputStream;
++import java.io.StringReader;
++import java.util.Arrays;
++import java.util.List;
++import javax.imageio.IIOImage;
++import javax.imageio.ImageIO;
++import javax.imageio.ImageReader;
++import javax.imageio.ImageTypeSpecifier;
++import javax.imageio.ImageWriteParam;
++import javax.imageio.ImageWriter;
++import javax.imageio.metadata.IIOMetadata;
++import javax.imageio.stream.ImageInputStream;
++import javax.imageio.stream.ImageOutputStream;
++import javax.imageio.stream.MemoryCacheImageInputStream;
++import javax.imageio.stream.MemoryCacheImageOutputStream;
++import javax.xml.transform.Result;
++import javax.xml.transform.Source;
++import javax.xml.transform.TransformerFactory;
++import javax.xml.transform.dom.DOMResult;
++import javax.xml.transform.stream.StreamSource;
++import javax.xml.xpath.XPath;
++import javax.xml.xpath.XPathConstants;
++import javax.xml.xpath.XPathFactory;
++import org.w3c.dom.Document;
++import org.w3c.dom.Element;
++import org.w3c.dom.Node;
++import org.w3c.dom.NodeList;
++
++public class BooleanAttributes {
++
++ private static TransformerFactory transformerFactory =
++ TransformerFactory.newInstance();
++
++ private static XPath xpathEngine = XPathFactory.newInstance().newXPath();
++
++ public static void main(String[] args) throws Exception {
++ test("image/png", false, "<javax_imageio_1.0 />",
++ "Chroma/BlackIsZero/@value",
++ "Compression/Lossless/@value");
++
++ test("image/png", false,
++ "<javax_imageio_png_1.0>" +
++ "<iTXt><iTXtEntry keyword='Comment' compressionFlag='TRUE' " +
++ "compressionMethod='0' languageTag='en' " +
++ "translatedKeyword='comment' text='foo'/></iTXt>" +
++ "</javax_imageio_png_1.0>",
++ "iTXt/iTXtEntry/@compressionFlag");
++
++ test("image/png", false,
++ "<javax_imageio_png_1.0>" +
++ "<iTXt><iTXtEntry keyword='Comment' compressionFlag='FALSE' " +
++ "compressionMethod='0' languageTag='en' " +
++ "translatedKeyword='comment' text='foo'/></iTXt>" +
++ "</javax_imageio_png_1.0>",
++ "iTXt/iTXtEntry/@compressionFlag");
++
++ test("image/gif", false, "<javax_imageio_1.0 />",
++ "Chroma/BlackIsZero/@value",
++ "Compression/Lossless/@value");
++
++ test("image/gif", false,
++ "<javax_imageio_gif_image_1.0>" +
++ "<ImageDescriptor imageLeftPosition='0' imageTopPosition='0' " +
++ "imageWidth='16' imageHeight='16' interlaceFlag='TRUE' />" +
++ "<LocalColorTable sizeOfLocalColorTable='2' " +
++ "backgroundColorIndex='1' sortFlag='TRUE'>" +
++ "<ColorTableEntry index='0' red='0' green='0' blue='0' />" +
++ "<ColorTableEntry index='1' red='255' green='255' blue='255' />" +
++ "</LocalColorTable>" +
++ "<GraphicControlExtension disposalMethod='doNotDispose' " +
++ "userInputFlag='FALSE' transparentColorFlag='TRUE' " +
++ "delayTime='100' transparentColorIndex='1' />" +
++ "</javax_imageio_gif_image_1.0>",
++ "ImageDescriptor/@interlaceFlag",
++ "LocalColorTable/@sortFlag",
++ "GraphicControlExtension/@userInputFlag",
++ "GraphicControlExtension/@transparentColorFlag");
++
++ test("image/gif", true,
++ "<javax_imageio_gif_stream_1.0>" +
++ "<GlobalColorTable sizeOfGlobalColorTable='2' " +
++ "backgroundColorIndex='1' sortFlag='TRUE'>" +
++ "<ColorTableEntry index='0' red='0' green='0' blue='0' />" +
++ "<ColorTableEntry index='1' red='255' green='255' blue='255' />" +
++ "</GlobalColorTable>" +
++ "</javax_imageio_gif_stream_1.0>",
++ "GlobalColorTable/@sortFlag");
++
++ test("image/jpeg", false, "<javax_imageio_1.0 />",
++ "Compression/Lossless/@value");
++ }
++
++ private static void transform(Source src, Result dst)
++ throws Exception
++ {
++ transformerFactory.newTransformer().transform(src, dst);
++ }
++
++ private static void verify(Node meta, String[] xpaths, boolean required)
++ throws Exception
++ {
++ for (String xpath: xpaths) {
++ NodeList list = (NodeList)
++ xpathEngine.evaluate(xpath, meta, XPathConstants.NODESET);
++ if (list.getLength() == 0 && required)
++ throw new AssertionError("Missing value: " + xpath);
++ for (int i = 0; i < list.getLength(); ++i) {
++ String value = list.item(i).getNodeValue();
++ if (!(value.equals("TRUE") || value.equals("FALSE")))
++ throw new AssertionError(xpath + " has value " + value);
++ }
++ }
++ }
++
++ public static void test(String mimeType, boolean useStreamMeta,
++ String metaXml, String... boolXpaths)
++ throws Exception
++ {
++ BufferedImage img =
++ new BufferedImage(16, 16, BufferedImage.TYPE_INT_RGB);
++ ImageWriter iw = ImageIO.getImageWritersByMIMEType(mimeType).next();
++ ByteArrayOutputStream os = new ByteArrayOutputStream();
++ ImageOutputStream ios = new MemoryCacheImageOutputStream(os);
++ iw.setOutput(ios);
++ ImageWriteParam param = null;
++ IIOMetadata streamMeta = iw.getDefaultStreamMetadata(param);
++ IIOMetadata imageMeta =
++ iw.getDefaultImageMetadata(new ImageTypeSpecifier(img), param);
++ IIOMetadata meta = useStreamMeta ? streamMeta : imageMeta;
++ Source src = new StreamSource(new StringReader(metaXml));
++ DOMResult dst = new DOMResult();
++ transform(src, dst);
++ Document doc = (Document)dst.getNode();
++ Element node = doc.getDocumentElement();
++ String metaFormat = node.getNodeName();
++
++ // Verify that the default metadata gets formatted correctly.
++ verify(meta.getAsTree(metaFormat), boolXpaths, false);
++
++ meta.mergeTree(metaFormat, node);
++
++ // Verify that the merged metadata gets formatte correctly.
++ verify(meta.getAsTree(metaFormat), boolXpaths, true);
++
++ iw.write(streamMeta, new IIOImage(img, null, imageMeta), param);
++ iw.dispose();
++ ios.close();
++ ImageReader ir = ImageIO.getImageReader(iw);
++ byte[] bytes = os.toByteArray();
++ if (bytes.length == 0)
++ throw new AssertionError("Zero length image file");
++ ByteArrayInputStream is = new ByteArrayInputStream(bytes);
++ ImageInputStream iis = new MemoryCacheImageInputStream(is);
++ ir.setInput(iis);
++ if (useStreamMeta) meta = ir.getStreamMetadata();
++ else meta = ir.getImageMetadata(0);
++
++ // Verify again after writing and re-reading the image
++ verify(meta.getAsTree(metaFormat), boolXpaths, true);
++ }
++
++ public static void xtest(Object... eatAnyArguments) {
++ System.err.println("Disabled test! Change xtest back into test!");
++ }
++
++}
+diff -r 91bc016862c4 -r 80fb12052ae4 test/javax/imageio/plugins/png/ITXtTest.java
+--- openjdk.orig/jdk/test/javax/imageio/plugins/png/ITXtTest.java Mon Jan 12 16:02:47 2009 -0800
++++ openjdk/jdk/test/javax/imageio/plugins/png/ITXtTest.java Tue Jan 13 16:55:12 2009 +0300
+@@ -123,7 +123,7 @@
+ }
+ t.keyword = e.getAttribute("keyword");
+ t.isCompressed =
+- (Integer.valueOf(e.getAttribute("compressionFlag")).intValue() == 1);
++ Boolean.valueOf(e.getAttribute("compressionFlag")).booleanValue();
+ t.compression =
+ Integer.valueOf(e.getAttribute("compressionMethod")).intValue();
+ t.language = e.getAttribute("languageTag");
More information about the distro-pkg-dev
mailing list