fix: stricter date parsing in value.cpp (#1720)
* Regression test for issue 1713 * Stricter date parsing. * Fix test failure caused by stdout mismatch. (cherry picked from commit ab58026cff0e5edebc026261e9dc4b7db05b802d)main
parent
1d64f482ff
commit
a4c5bdac19
@ -0,0 +1,87 @@
|
||||
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
|
||||
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="3.1.2-113">
|
||||
<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:xmp="http://ns.adobe.com/xap/1.0/"
|
||||
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
|
||||
xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
|
||||
xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
|
||||
xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
|
||||
xmlns:exif="http://ns.adobe.com/exif/1.0/"
|
||||
dc:format="image/jpeg"
|
||||
xmp:CreatorTool="Adobe Photoshop CS2 Macintosh"
|
||||
xmp:CreateDate="2005-09-07415:07:40-07:00"
|
||||
xmp:ModifyDate="2005-09-07T15:09:51-07:00"
|
||||
xmp:MetadataDate="2006-04-10T13:37:10-07:00"
|
||||
xmpMM:DocumentID="uuid:9A3B7F52214211DAB6308A7391270C13"
|
||||
xmpMM:InstanceID="uuid:B59AC1B3214311DAB6308A7391270C13"
|
||||
photoshop:ColorMode="3"
|
||||
photoshop:ICCProfile="sRGB IEC61966-2.1"
|
||||
tiff:Orientation="1"
|
||||
tiff:XResolution="720000/10000"
|
||||
tiff:YResŽlution="720000/10000"
|
||||
tiff:ResolutionUnit="2"
|
||||
tiff:ImageWidth="360"
|
||||
tiff:ImageLength="216"
|
||||
tiff:NativeDigest="256,257,258,259,262,274,277,284,530,531,282,28256FC8D17D036C26919E106D"
|
||||
tiff:Make="Nikon"
|
||||
exif:PixelelYDimension="216"
|
||||
exif:ColorSpace="1"
|
||||
exif:NativeDigest="36864,40960,40961,37121,37122,40962,40963,37510,;0964,36867,36868,33434,33437,34850,34852,34855,34856,32,23,24,25,26,27,28,30;76DBD9F0A5E7ED8F62B4CE8EFA6478B4">
|
||||
<dc:title>
|
||||
<rdf:Alt>
|
||||
<rdf:li xml:lang="en-US">Blue Square Test File - .jpg</rdf:li>
|
||||
<rdf:li xml:lang="x-default">Blue Square Test File - .jpg</rdf:li>
|
||||
<rdf:li xml:lang="de-CH">Blaues Quadrat Test Datei - .jpg</rdf:li>
|
||||
</rdf:Alt>
|
||||
</dc:title>
|
||||
<dc:description>
|
||||
<rdf:Alt>
|
||||
<rdf:li xml:lang="x-default">XMPFiles BlueSquare test file, created in Photoshop CS2, saved as .psd, .jpg, and .tif.</rdf:li>
|
||||
</rdf:Alt>
|
||||
</dc:description>
|
||||
<dc:subject>
|
||||
<rdf:Bag>
|
||||
<rdf:li>XMP</rdf:li>
|
||||
<rdf:li>Blue Square</rdf:li>
|
||||
<rdf:li>test file</rdf:li>
|
||||
<rdf:li>Photoshop</rdf:li>
|
||||
<rdf:li>.jpg</rdf:li>
|
||||
</rdf:Bag>
|
||||
</dc:subject>
|
||||
<xmpMM:DerivedFrom
|
||||
stRef:instanceID="uuid:9A3B7F4F214211DAB6308A7391270C13"
|
||||
stRef:documentID="uuid:9A3B7F4E214211DAB6308A7391270C13"/>
|
||||
<tiff:BitsPerSample>
|
||||
<rdf:Seq>
|
||||
<rdf:li>8</rdf:li>
|
||||
<rdf:li>8</rdf:li>
|
||||
<rdf:li>8</rdf:li>
|
||||
</rdf:Seq>
|
||||
</tiff:BitsPerSample>
|
||||
</rdf:Description>
|
||||
</rdf:RDF>
|
||||
</x:xmpmeta>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<?xpacket end="w"?>
|
@ -0,0 +1,26 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from system_tests import CaseMeta, path
|
||||
|
||||
|
||||
class InvalidDateXMP(metaclass=CaseMeta):
|
||||
"""
|
||||
Regression test for the bug described in:
|
||||
https://github.com/Exiv2/exiv2/issues/1713
|
||||
"""
|
||||
url = "https://github.com/Exiv2/exiv2/issues/1713"
|
||||
|
||||
filename = path("$data_path/issue_1713_poc.xmp")
|
||||
commands = ["$exiv2 -Ph $filename"]
|
||||
|
||||
stderr = [
|
||||
"""Warning: Failed to convert Xmp.xmp.CreateDate to Exif.Photo.DateTimeDigitized (Day is out of range)
|
||||
Exiv2 exception in print action for file $filename:
|
||||
Xmpdatum::copy: Not supported
|
||||
"""
|
||||
]
|
||||
retval = [1]
|
||||
|
||||
def compare_stdout(self, i, command, got_stdout, expected_stdout):
|
||||
""" We don't care about the stdout, just don't crash """
|
||||
pass
|
Loading…
Reference in New Issue