From ef09b599f6d89f49666653161cedd7196c65e8f6 Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Sun, 27 Dec 2009 16:33:09 +0100 Subject: [PATCH] Updated metadataformat to use new Metadata classes (how did IDEA's refactorings miss this? Hmmm...) --- .../twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java b/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java index b842ad3b..b6a78cb6 100644 --- a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java +++ b/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java @@ -1,5 +1,6 @@ package com.twelvemonkeys.imageio.plugins.psd; +import com.twelvemonkeys.imageio.metadata.Directory; import org.w3c.dom.Document; import javax.imageio.ImageTypeSpecifier; @@ -98,7 +99,7 @@ public final class PSDMetadataFormat extends IIOMetadataFormatImpl { // root -> ImageResources -> EXIF addElement("EXIF", "ImageResources", CHILD_POLICY_EMPTY); - addObjectValue("EXIF", PSDEXIF1Data.Directory.class, true, null); + addObjectValue("EXIF", Directory.class, true, null); // TODO: Incorporate EXIF / TIFF metadata here somehow... (or treat as opaque bytes?) // root -> ImageResources -> GridAndGuideInfo @@ -116,7 +117,7 @@ public final class PSDMetadataFormat extends IIOMetadataFormatImpl { // root -> ImageResources -> IPTC addElement("IPTC", "ImageResources", CHILD_POLICY_EMPTY); - addObjectValue("IPTC", PSDIPTCData.Directory.class, true, null); + addObjectValue("IPTC", Directory.class, true, null); // TODO: Incorporate IPTC metadata here somehow... (or treat as opaque bytes?) // root -> ImageResources -> PixelAspectRatio