third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source
This commit is contained in:
Viktor Schneider
2022-08-01 22:20:01 +02:00
parent 37dc2ee2d7 1d0530f04d
commit 73a1a0ec21
175 changed files with 9061 additions and 7032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/data/20220610_MG_7237.exv
BIN
View File
Binary file not shown.
test/data/20220610_MG_7238.exv
BIN
View File
Binary file not shown.
test/data/20220610_MG_7239.exv
BIN
View File
Binary file not shown.
test/data/20220610_MG_7240.exv
BIN
View File
Binary file not shown.
test/data/20220610_MG_7241.exv
BIN
View File
Binary file not shown.
test/data/issue_2233_poc1.jxl
BIN
View File
Binary file not shown.
test/data/issue_2233_poc2.jxl
BIN
View File
Binary file not shown.
test/data/issue_2246_poc1.exv
BIN
View File
Binary file not shown.
test/data/issue_2268_poc.jp2
BIN
View File
Binary file not shown.
test/data/test_reference_files/20220610_MG_7237.exv.out
+213
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/20220610_MG_7238.exv.out
+213
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/20220610_MG_7239.exv.out
+213
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/20220610_MG_7240.exv.out
+213
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/20220610_MG_7241.exv.out
+213
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/exiv2-test.out
+6 -3
View File
@@ -90,15 +90,18 @@ Options:
E : Exif tags
I : IPTC tags
X : XMP tags
x : Tag number (Exif and IPTC only)
x : Tag number for Exif or IPTC tags (in hexadecimal)
g : Group name (e.g. Exif.Photo.UserComment, Photo)
k : Key (e.g. Exif.Photo.UserComment)
l : Tag label (e.g. Exif.Photo.UserComment, 'User comment')
d : Tag description
n : Tag name (e.g. Exif.Photo.UserComment, UserComment)
y : Type
y : Type
c : Number of components (count)
s : Size in bytes (Ascii and Comment types include NULL)
v : Plain data value, untranslated (vanilla)
s : Size in bytes of vanilla value (may include NULL)
v : Plain data value of untranslated (vanilla)
V : Plain data value, data type and the word 'set'
t : Interpreted (translated) human readable values
h : Hex dump of the data
-d tgt1 Delete target(s) for the 'delete' action. Possible targets are:
test/data/test_reference_files/issue_2233_poc1.jxl.out
+39
View File
@@ -0,0 +1,39 @@
Exif.Image.ImageWidth Long 1 160 160
Exif.Image.ImageLength Long 1 97 97
Exif.Image.BitsPerSample Short 3 8 8 8 8 8 8
Exif.Image.Orientation Short 1 1 top, left
Exif.Image.XResolution Rational 1 300/1 300
Exif.Image.YResolution Rational 1 300/1 300
Exif.Image.ResolutionUnit Short 1 2 inch
Exif.Image.Software Ascii 13 GIMP 2.99.11 GIMP 2.99.11
Exif.Image.DateTime Ascii 20 2022:05:10 17:10:08 2022:05:10 17:10:08
Exif.Image.ExifTag Long 1 202 202
Exif.Photo.ColorSpace Short 1 1 sRGB
Exif.Image.GPSTag Long 1 220 220
Exif.GPSInfo.GPSAltitude Rational 1 0/100 0.0 m
Xmp.xmpMM.DocumentID XmpText 52 gimp:docid:gimp:044333cc-8cd4-44da-a3f7-b4d9ae9ee740 gimp:docid:gimp:044333cc-8cd4-44da-a3f7-b4d9ae9ee740
Xmp.xmpMM.InstanceID XmpText 44 xmp.iid:b9cf7f00-cf00-4264-a8f8-bccde48e0f1a xmp.iid:b9cf7f00-cf00-4264-a8f8-bccde48e0f1a
Xmp.xmpMM.OriginalDocumentID XmpText 44 xmp.did:6589fec5-f1c4-4e37-b7ba-f58bfcc61271 xmp.did:6589fec5-f1c4-4e37-b7ba-f58bfcc61271
Xmp.xmpMM.History XmpText 0 type="Seq"
Xmp.xmpMM.History[1] XmpText 0 type="Struct"
Xmp.xmpMM.History[1]/stEvt:action XmpText 5 saved saved
Xmp.xmpMM.History[1]/stEvt:changed XmpText 9 /metadata /metadata
Xmp.xmpMM.History[1]/stEvt:instanceID XmpText 44 xmp.iid:d87c2c5a-77f8-4da9-b6ac-04ce223765a9 xmp.iid:d87c2c5a-77f8-4da9-b6ac-04ce223765a9
Xmp.xmpMM.History[1]/stEvt:softwareAgent XmpText 20 GIMP 2.99.11 (Linux) GIMP 2.99.11 (Linux)
Xmp.xmpMM.History[1]/stEvt:when XmpText 25 2022-05-10T17:09:05+02:00 2022-05-10T17:09:05+02:00
Xmp.xmpMM.History[2] XmpText 0 type="Struct"
Xmp.xmpMM.History[2]/stEvt:action XmpText 5 saved saved
Xmp.xmpMM.History[2]/stEvt:changed XmpText 1 / /
Xmp.xmpMM.History[2]/stEvt:instanceID XmpText 44 xmp.iid:f9384fe5-1151-433d-a148-49f9fe6cf112 xmp.iid:f9384fe5-1151-433d-a148-49f9fe6cf112
Xmp.xmpMM.History[2]/stEvt:softwareAgent XmpText 20 GIMP 2.99.11 (Linux) GIMP 2.99.11 (Linux)
Xmp.xmpMM.History[2]/stEvt:when XmpText 25 2022-05-10T17:10:08+02:00 2022-05-10T17:10:08+02:00
Xmp.dc.Format XmpText 9 image/jxl image/jxl
Xmp.dc.creator XmpSeq 1 exiv2.org exiv2.org
Xmp.dc.description LangAlt 1 lang="x-default" Test image lang="x-default" Test image
Xmp.dc.title LangAlt 1 lang="x-default" Logo lang="x-default" Logo
Xmp.GIMP.API XmpText 3 3.0 3.0
Xmp.GIMP.Platform XmpText 5 Linux Linux
Xmp.GIMP.TimeStamp XmpText 16 1652195408540570 1652195408540570
Xmp.GIMP.Version XmpText 7 2.99.11 2.99.11
Xmp.tiff.Orientation XmpText 1 1 top, left
Xmp.xmp.CreatorTool XmpText 4 GIMP GIMP
test/data/test_reference_files/issue_2233_poc2.jxl.out
+39
View File
@@ -0,0 +1,39 @@
Exif.Image.ImageWidth Long 1 160 160
Exif.Image.ImageLength Long 1 97 97
Exif.Image.BitsPerSample Short 3 8 8 8 8 8 8
Exif.Image.Orientation Short 1 1 top, left
Exif.Image.XResolution Rational 1 300/1 300
Exif.Image.YResolution Rational 1 300/1 300
Exif.Image.ResolutionUnit Short 1 2 inch
Exif.Image.Software Ascii 13 GIMP 2.99.11 GIMP 2.99.11
Exif.Image.DateTime Ascii 20 2022:05:10 17:10:08 2022:05:10 17:10:08
Exif.Image.ExifTag Long 1 202 202
Exif.Photo.ColorSpace Short 1 1 sRGB
Exif.Image.GPSTag Long 1 220 220
Exif.GPSInfo.GPSAltitude Rational 1 0/100 0.0 m
Xmp.xmpMM.DocumentID XmpText 52 gimp:docid:gimp:044333cc-8cd4-44da-a3f7-b4d9ae9ee740 gimp:docid:gimp:044333cc-8cd4-44da-a3f7-b4d9ae9ee740
Xmp.xmpMM.InstanceID XmpText 44 xmp.iid:b9cf7f00-cf00-4264-a8f8-bccde48e0f1a xmp.iid:b9cf7f00-cf00-4264-a8f8-bccde48e0f1a
Xmp.xmpMM.OriginalDocumentID XmpText 44 xmp.did:6589fec5-f1c4-4e37-b7ba-f58bfcc61271 xmp.did:6589fec5-f1c4-4e37-b7ba-f58bfcc61271
Xmp.xmpMM.History XmpText 0 type="Seq"
Xmp.xmpMM.History[1] XmpText 0 type="Struct"
Xmp.xmpMM.History[1]/stEvt:action XmpText 5 saved saved
Xmp.xmpMM.History[1]/stEvt:changed XmpText 9 /metadata /metadata
Xmp.xmpMM.History[1]/stEvt:instanceID XmpText 44 xmp.iid:d87c2c5a-77f8-4da9-b6ac-04ce223765a9 xmp.iid:d87c2c5a-77f8-4da9-b6ac-04ce223765a9
Xmp.xmpMM.History[1]/stEvt:softwareAgent XmpText 20 GIMP 2.99.11 (Linux) GIMP 2.99.11 (Linux)
Xmp.xmpMM.History[1]/stEvt:when XmpText 25 2022-05-10T17:09:05+02:00 2022-05-10T17:09:05+02:00
Xmp.xmpMM.History[2] XmpText 0 type="Struct"
Xmp.xmpMM.History[2]/stEvt:action XmpText 5 saved saved
Xmp.xmpMM.History[2]/stEvt:changed XmpText 1 / /
Xmp.xmpMM.History[2]/stEvt:instanceID XmpText 44 xmp.iid:f9384fe5-1151-433d-a148-49f9fe6cf112 xmp.iid:f9384fe5-1151-433d-a148-49f9fe6cf112
Xmp.xmpMM.History[2]/stEvt:softwareAgent XmpText 20 GIMP 2.99.11 (Linux) GIMP 2.99.11 (Linux)
Xmp.xmpMM.History[2]/stEvt:when XmpText 25 2022-05-10T17:10:08+02:00 2022-05-10T17:10:08+02:00
Xmp.dc.Format XmpText 9 image/jxl image/jxl
Xmp.dc.creator XmpSeq 1 exiv2.org exiv2.org
Xmp.dc.description LangAlt 1 lang="x-default" Test image lang="x-default" Test image
Xmp.dc.title LangAlt 1 lang="x-default" Logo lang="x-default" Logo
Xmp.GIMP.API XmpText 3 3.0 3.0
Xmp.GIMP.Platform XmpText 5 Linux Linux
Xmp.GIMP.TimeStamp XmpText 16 1652195408540570 1652195408540570
Xmp.GIMP.Version XmpText 7 2.99.11 2.99.11
Xmp.tiff.Orientation XmpText 1 1 top, left
Xmp.xmp.CreatorTool XmpText 4 GIMP GIMP
test/data/test_reference_files/issue_2246_poc1.exv.out
+199
View File
File diff suppressed because one or more lines are too long
test/data/test_reference_files/olympus-m.zuiko-12-45mm-f4-pro.exv.out
+2 -2
View File
@@ -78,7 +78,7 @@ Exif.OlympusCs.FlashRemoteControl Short 1 0 Off
Exif.OlympusCs.FlashControlMode Short 4 0 0 0 0 Off
Exif.OlympusCs.FlashIntensity SRational 4 0/0 0/0 0/0 0/0 0/0 0/0 0/0 0/0
Exif.OlympusCs.ManualFlashStrength SRational 4 0/0 0/0 0/0 0/0 0/0 0/0 0/0 0/0
Exif.OlympusCs.WhiteBalance Short 1 1 Auto (Keep Warm Color Off
Exif.OlympusCs.WhiteBalance Short 1 1 Auto (Keep Warm Color Off)
Exif.OlympusCs.WhiteBalanceTemperature Short 1 0 0
Exif.OlympusCs.WhiteBalanceBracket SShort 2 0 0 0 0
Exif.OlympusCs.CustomSaturation SShort 3 0 -5 5 0 -5 5
@@ -102,7 +102,7 @@ Exif.OlympusCs.NoiseFilter SShort 3 -2 -2 1 Off
Exif.OlympusCs.ArtFilter Short 4 0 0 0 0 Off
Exif.OlympusCs.DriveMode Short 5 1 1 0 0 0 1 1 0 0 0
Exif.OlympusCs.PanoramaMode Short 2 0 0 0 0
Exif.OlympusCs.ImageStabilization Long 1 4 (4)
Exif.OlympusCs.ImageStabilization Long 1 4 S-IS AUTO
Exif.OlympusCs.ManometerPressure Short 1 0 0
Exif.OlympusCs.ManometerReading SLong 2 -9999 -9999 -9999 -9999
Exif.OlympusCs.ExtendedWBDetect Short 1 0 Off
test/data/test_reference_files/olympus-m.zuiko-17mm-f1.2-pro.exv.out
+1 -1
View File
@@ -103,7 +103,7 @@ Exif.OlympusCs.NoiseFilter SShort 3 0 -2 1 Standard
Exif.OlympusCs.ArtFilter Short 4 0 0 0 0 Off
Exif.OlympusCs.DriveMode Short 5 5 1 1 0 0 5 1 1 0 0
Exif.OlympusCs.PanoramaMode Short 2 0 0 0 0
Exif.OlympusCs.ImageStabilization Long 1 4 (4)
Exif.OlympusCs.ImageStabilization Long 1 4 S-IS AUTO
Exif.OlympusCs.ManometerPressure Short 1 0 0
Exif.OlympusCs.ManometerReading SLong 2 -9999 -9999 -9999 -9999
Exif.OlympusCs.ExtendedWBDetect Short 1 0 Off
test/data/test_reference_files/test_issue_2126.exv.out
+1 -1
View File
@@ -110,7 +110,7 @@ Exif.OlympusCs.NoiseFilter SShort 3 -1 -2 1 Low
Exif.OlympusCs.ArtFilter Short 4 0 0 0 0 Off
Exif.OlympusCs.DriveMode Short 6 0 0 0 0 2 17 0 0 0 0 2 17
Exif.OlympusCs.PanoramaMode Short 2 0 0 0 0
Exif.OlympusCs.ImageStabilization Long 1 4 (4)
Exif.OlympusCs.ImageStabilization Long 1 4 S-IS AUTO
Exif.OlympusCs.ManometerPressure Short 1 0 0
Exif.OlympusCs.ManometerReading SLong 2 -9999 -9999 -9999 -9999
Exif.OlympusCs.ExtendedWBDetect Short 1 0 Off