Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2026-04-30 00:00:01 -04:00
Code Issues Projects Releases Wiki Activity

Massive metadata cleanup, new test cases and bugfix.

Browse Source
This commit is contained in:
Harald Kuhr
2012-01-13 17:16:59 +01:00
parent 529377aa01
commit 84a2e8b10c
55 changed files with 3155 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-metadata/src/test/resources/exif/exif-jpeg-segment.bin
BIN
View File
Binary file not shown.
imageio/imageio-metadata/src/test/resources/iptc/iptc-jpeg-segment.bin
BIN
View File
Binary file not shown.
imageio/imageio-metadata/src/test/resources/psd/psd-jpeg-segment.bin
BIN
View File
Binary file not shown.
imageio/imageio-metadata/src/test/resources/xmp/rdf-alt-example.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<rdf:Description rdf:about="">
<dc:subject>
<rdf:Alt>
<rdf:li xml:lang="x-default">One</rdf:li>
<rdf:li xml:lang="en-us">One</rdf:li>
<rdf:li xml:lang="de">Ein</rdf:li>
<rdf:li xml:lang="no-nb">En</rdf:li>
</rdf:Alt>
</dc:subject>
</rdf:Description>
</rdf:RDF>
imageio/imageio-metadata/src/test/resources/xmp/rdf-attribute-shorthand.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.1-c036 46.276720, Mon Feb 19 2007 22:40:08 ">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:xap="http://ns.adobe.com/xap/1.0/" xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
xmlns:tiff="http://ns.adobe.com/tiff/1.0/" xmlns:exif="http://ns.adobe.com/exif/1.0/"
xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
dc:format="image/jpeg"
xap:CreatorTool="Adobe Photoshop CS3 Windows"
xap:CreateDate="2008-07-16T14:44:49-07:00"
xap:ModifyDate="2008-07-16T14:44:49-07:00"
xap:MetadataDate="2008-07-16T14:44:49-07:00"
xapMM:DocumentID="uuid:6DCA50CC7D53DD119F20F5A7EA4C9BEC"
xapMM:InstanceID="uuid:6ECA50CC7D53DD119F20F5A7EA4C9BEC"
tiff:Orientation="1"
tiff:XResolution="720000/10000"
tiff:YResolution="720000/10000"
tiff:ResolutionUnit="2"
tiff:NativeDigest="256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;C08D8E93274C4BEE83E86CF999955A87"
exif:PixelXDimension="426"
exif:PixelYDimension="550"
exif:ColorSpace="-1"
exif:NativeDigest="36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;A7F21D25E2C562F152B2C4ECC9E534DA"
photoshop:ColorMode="1"
photoshop:ICCProfile="Dot Gain 20%"
photoshop:History="">
<xapMM:DerivedFrom stRef:instanceID="uuid:74E1C905B405DD119306A1902BA5AA28"
stRef:documentID="uuid:7A6C79768005DD119306A1902BA5AA28"/>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
imageio/imageio-metadata/src/test/resources/xmp/rdf-bag-example.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<rdf:Description rdf:about="">
<dc:subject>
<rdf:Bag>
<rdf:li>XMP</rdf:li>
<rdf:li>metadata</rdf:li>
<rdf:li>ISO standard</rdf:li>
</rdf:Bag>
</dc:subject>
</rdf:Description>
</rdf:RDF>
imageio/imageio-metadata/src/test/resources/xmp/rdf-seq-example.xml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<rdf:Description rdf:about="">
<dc:subject>
<rdf:Seq>
<rdf:li>XMP</rdf:li>
<rdf:li>metadata</rdf:li>
<rdf:li>ISO standard</rdf:li>
</rdf:Seq>
</dc:subject>
</rdf:Description>
</rdf:RDF>
imageio/imageio-metadata/src/test/resources/xmp/xmp-jpeg-example.xml
+187
View File
@@ -0,0 +1,187 @@
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="3.1.1-111">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
<photoshop:DateCreated>2008-07-01</photoshop:DateCreated>
<photoshop:ColorMode>4</photoshop:ColorMode>
<photoshop:ICCProfile>U.S. Web Coated (SWOP) v2</photoshop:ICCProfile>
<photoshop:History/>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#">
<xapMM:DocumentID>uuid:54A8D5F8654711DD9226A85E1241887A</xapMM:DocumentID>
<xapMM:InstanceID>uuid:54A8D5F9654711DD9226A85E1241887A</xapMM:InstanceID>
<xapMM:DerivedFrom rdf:parseType="Resource">
<stRef:instanceID>uuid:3B52F3610F49DD118831FCA29C13B8DE</stRef:instanceID>
<stRef:documentID>uuid:3A52F3610F49DD118831FCA29C13B8DE</stRef:documentID>
</xapMM:DerivedFrom>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:dc="http://purl.org/dc/elements/1.1/">
<dc:description>
<rdf:Alt>
<rdf:li xml:lang="x-default">Picture 71146</rdf:li>
</rdf:Alt>
</dc:description>
<dc:format>image/jpeg</dc:format>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:tiff="http://ns.adobe.com/tiff/1.0/">
<tiff:ImageWidth>3601</tiff:ImageWidth>
<tiff:ImageLength>4176</tiff:ImageLength>
<tiff:BitsPerSample>
<rdf:Seq>
<rdf:li>8</rdf:li>
<rdf:li>8</rdf:li>
<rdf:li>8</rdf:li>
</rdf:Seq>
</tiff:BitsPerSample>
<tiff:Compression>1</tiff:Compression>
<tiff:PhotometricInterpretation>2</tiff:PhotometricInterpretation>
<tiff:SamplesPerPixel>3</tiff:SamplesPerPixel>
<tiff:PlanarConfiguration>1</tiff:PlanarConfiguration>
<tiff:XResolution>3000000/10000</tiff:XResolution>
<tiff:YResolution>3000000/10000</tiff:YResolution>
<tiff:ResolutionUnit>2</tiff:ResolutionUnit>
<tiff:Orientation>1</tiff:Orientation>
<tiff:NativeDigest>256,257,258,259,262,274,277,284,530,531,282,283,296,301,318,319,529,532,306,270,271,272,305,315,33432;C21EE6D33E4CCA3712ECB1F5E9031A49</tiff:NativeDigest>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:xap="http://ns.adobe.com/xap/1.0/">
<xap:ModifyDate>2008-08-06T12:43:05+10:00</xap:ModifyDate>
<xap:CreatorTool>Adobe Photoshop CS2 Macintosh</xap:CreatorTool>
<xap:CreateDate>2008-08-06T12:43:05+10:00</xap:CreateDate>
<xap:MetadataDate>2008-08-06T12:43:05+10:00</xap:MetadataDate>
</rdf:Description>
<rdf:Description rdf:about=""
xmlns:exif="http://ns.adobe.com/exif/1.0/">
<exif:ColorSpace>-1</exif:ColorSpace>
<exif:PixelXDimension>3601</exif:PixelXDimension>
<exif:PixelYDimension>4176</exif:PixelYDimension>
<exif:NativeDigest>36864,40960,40961,37121,37122,40962,40963,37510,40964,36867,36868,33434,33437,34850,34852,34855,34856,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37396,41483,41484,41486,41487,41488,41492,41493,41495,41728,41729,41730,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,42016,0,2,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,20,22,23,24,25,26,27,28,30;297AD344CC15F29D5283460ED026368F</exif:NativeDigest>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>
<?xpacket end="w"?>