Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-10-04 11:26:44 -04:00
Code Issues Projects Releases Wiki Activity

#390 Deferred parsing of embedded resources. Allows reading pixel data for images with unparseable metadata.

Browse Source 
Broken metadata is now ignored + warning, rather than causing exceptions.
This commit is contained in:
Harald Kuhr
2017-11-05 10:29:49 +01:00
parent 6b966a2d4f
commit 1c27b58598
9 changed files with 169 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPReader.java
View File

@@ -39,6 +39,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
import javax.imageio.IIOException;
import javax.imageio.stream.ImageInputStream;
@@ -73,6 +74,7 @@ public final class XMPReader extends MetadataReader {
// TODO: Refactor scanner to return inputstream?
// TODO: Be smarter about ASCII-NULL termination/padding (the SAXParser aka Xerces DOMParser doesn't like it)...
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setErrorHandler(new DefaultHandler());
Document document = builder.parse(new InputSource(IIOUtil.createStreamAdapter(input)));
// XMLSerializer serializer = new XMLSerializer(System.err, System.getProperty("file.encoding"));