Skip to content

Commit 59df5fe

Browse files
serghovserghov
committed
update stdin and webp tests for shorter XMP toolkit version string
The XMP toolkit version string changed from "XMP Core 4.4.0-Exiv2" (20 chars) to "XMP Core 6.0.0" (14 chars), making every serialized XMP packet 6 bytes smaller. This shifts JPEG APP1 segment sizes and offsets in the stdin test, and RIFF container / XMP chunk sizes in the webp test. No semantic change to the metadata content.
1 parent 8189a99 commit 59df5fe

3 files changed

Lines changed: 64 additions & 64 deletions

File tree

‎test/data/issue_1998.xmp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
2-
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
2+
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 6.0.0">
33
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
44
<rdf:Description rdf:about=""
55
xmlns:xmp="http://ns.adobe.com/xap/1.0/"

‎test/data/test_reference_files/stdin-test.out‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -124,17 +124,17 @@ STRUCTURE OF JPEG FILE: girl.jpg
124124
0 | 0xffd8 SOI
125125
2 | 0xffe0 APP0 | 16 | JFIF.........
126126
20 | 0xffe1 APP1 | 5704 | Exif..II*......................
127-
5726 | 0xffe1 APP1 | 5287 | http://ns.adobe.com/xap/1.0/.<?x
128-
11015 | 0xffed APP13 | 784 | Photoshop 3.0.8BIM..........Z...
129-
11801 | 0xffdb DQT | 67
130-
11870 | 0xffdb DQT | 67
131-
11939 | 0xffc0 SOF0 | 17
132-
11958 | 0xffc4 DHT | 28
133-
11988 | 0xffc4 DHT | 74
134-
12064 | 0xffc4 DHT | 28
135-
12094 | 0xffc4 DHT | 57
136-
12153 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
137-
16757 | 0xffda SOS
127+
5726 | 0xffe1 APP1 | 5281 | http://ns.adobe.com/xap/1.0/.<?x
128+
11009 | 0xffed APP13 | 784 | Photoshop 3.0.8BIM..........Z...
129+
11795 | 0xffdb DQT | 67
130+
11864 | 0xffdb DQT | 67
131+
11933 | 0xffc0 SOF0 | 17
132+
11952 | 0xffc4 DHT | 28
133+
11982 | 0xffc4 DHT | 74
134+
12058 | 0xffc4 DHT | 28
135+
12088 | 0xffc4 DHT | 57
136+
12147 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
137+
16751 | 0xffda SOS
138138
STRUCTURE OF JPEG FILE: girl.jpg
139139
address | marker | length | data
140140
0 | 0xffd8 SOI
@@ -154,53 +154,53 @@ STRUCTURE OF JPEG FILE: girl.jpg
154154
0 | 0xffd8 SOI
155155
2 | 0xffe0 APP0 | 16 | JFIF.........
156156
20 | 0xffe1 APP1 | 8528 | Exif..II*......................
157-
8550 | 0xffe1 APP1 | 6730 | http://ns.adobe.com/xap/1.0/.<?x
158-
15282 | 0xffed APP13 | 788 | Photoshop 3.0.8BIM..........Z...
159-
16072 | 0xffdb DQT | 67
160-
16141 | 0xffdb DQT | 67
161-
16210 | 0xffc0 SOF0 | 17
162-
16229 | 0xffc4 DHT | 28
163-
16259 | 0xffc4 DHT | 74
164-
16335 | 0xffc4 DHT | 28
165-
16365 | 0xffc4 DHT | 57
166-
16424 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
167-
21028 | 0xffda SOS
157+
8550 | 0xffe1 APP1 | 6673 | http://ns.adobe.com/xap/1.0/.<?x
158+
15225 | 0xffed APP13 | 788 | Photoshop 3.0.8BIM..........Z...
159+
16015 | 0xffdb DQT | 67
160+
16084 | 0xffdb DQT | 67
161+
16153 | 0xffc0 SOF0 | 17
162+
16172 | 0xffc4 DHT | 28
163+
16202 | 0xffc4 DHT | 74
164+
16278 | 0xffc4 DHT | 28
165+
16308 | 0xffc4 DHT | 57
166+
16367 | 0xffe1 APP1 | 4602 | http://ns.adobe.com/xap/1.0/.<?x
167+
20971 | 0xffda SOS
168168
STRUCTURE OF JPEG FILE: Reagan.jpg
169169
address | marker | length | data
170170
0 | 0xffd8 SOI
171171
2 | 0xffe1 APP1 | 5704 | Exif..MM.*......................
172-
5708 | 0xffe1 APP1 | 5287 | http://ns.adobe.com/xap/1.0/.<?x
173-
10997 | 0xffe2 APP2 | 3160 | ICC_PROFILE......HLino....mntrRG chunk 1/1
174-
14159 | 0xffed APP13 | 3030 | Photoshop 3.0.8BIM..........Z...
175-
17191 | 0xffee APP14 | 14 | Adobe.d@....
176-
17207 | 0xffdb DQT | 132
177-
17341 | 0xffc0 SOF0 | 17
178-
17360 | 0xffdd DRI | 4
179-
17366 | 0xffc4 DHT | 418
180-
17786 | 0xffda SOS
172+
5708 | 0xffe1 APP1 | 5281 | http://ns.adobe.com/xap/1.0/.<?x
173+
10991 | 0xffe2 APP2 | 3160 | ICC_PROFILE......HLino....mntrRG chunk 1/1
174+
14153 | 0xffed APP13 | 3030 | Photoshop 3.0.8BIM..........Z...
175+
17185 | 0xffee APP14 | 14 | Adobe.d@....
176+
17201 | 0xffdb DQT | 132
177+
17335 | 0xffc0 SOF0 | 17
178+
17354 | 0xffdd DRI | 4
179+
17360 | 0xffc4 DHT | 418
180+
17780 | 0xffda SOS
181181
STRUCTURE OF PNG FILE: ReaganSmallPng.png
182182
address | chunk | length | data | checksum
183183
8 | IHDR | 13 | ............ | 0x8cf910c3
184184
33 | eXIf | 8520 | II*.......................... | 0x479a6662
185185
8565 | zTXt | 630 | Raw profile type iptc..x..T... | 0xa492403c
186186
9207 | iCCP | 2593 | ..x...wTS.....7.&....!...@.... | 0x56151192
187-
11812 | iTXt | 7117 | XML:com.adobe.xmp.....<?xpacke | 0x2ff025b8
188-
18941 | gAMA | 4 | .... | 0x0bfc6105
189-
18957 | bKGD | 6 | ...... | 0xa0bda793
190-
18975 | pHYs | 9 | ...#...#. | 0x78a53f76
191-
18996 | tIME | 7 | ......# | 0xdf7f5bbd
192-
19015 | zTXt | 278 | Comment..x.}..n.@....O..5..h.. | 0xdb1dfff5
193-
19305 | IDAT | 8192 | x...i.$.u%v....Gdd...U..X.`0.9 | 0x96dc2ed9
194-
27509 | IDAT | 8192 | df.."..1L...0...j....`F.&.yf.. | 0xbfeb3575
195-
35713 | IDAT | 8192 | K-N.t.ENL.R..q](jm...sN..U.+.. | 0xe249a922
196-
43917 | IDAT | 8192 | >..?.Nw..iN......xE....z..[..} | 0x054b9d1e
197-
52121 | IDAT | 7066 | ...q.B...2*@..#....T....h..v.. | 0x327f1e3e
198-
59199 | IEND | 0 | | 0xae426082
187+
11812 | iTXt | 7057 | XML:com.adobe.xmp.....<?xpacke | 0xfd71ca82
188+
18881 | gAMA | 4 | .... | 0x0bfc6105
189+
18897 | bKGD | 6 | ...... | 0xa0bda793
190+
18915 | pHYs | 9 | ...#...#. | 0x78a53f76
191+
18936 | tIME | 7 | ......# | 0xdf7f5bbd
192+
18955 | zTXt | 278 | Comment..x.}..n.@....O..5..h.. | 0xdb1dfff5
193+
19245 | IDAT | 8192 | x...i.$.u%v....Gdd...U..X.`0.9 | 0x96dc2ed9
194+
27449 | IDAT | 8192 | df.."..1L...0...j....`F.&.yf.. | 0xbfeb3575
195+
35653 | IDAT | 8192 | K-N.t.ENL.R..q](jm...sN..U.+.. | 0xe249a922
196+
43857 | IDAT | 8192 | >..?.Nw..iN......xE....z..[..} | 0x054b9d1e
197+
52061 | IDAT | 7066 | ...q.B...2*@..#....T....h..v.. | 0x327f1e3e
198+
59139 | IEND | 0 | | 0xae426082
199199
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
200200
Chunk | Length | Offset | Payload
201-
RIFF | 190110 | 0 | WEBP
201+
RIFF | 190104 | 0 | WEBP
202202
VP8X | 10 | 12 | ,........
203203
ICCP | 3144 | 30 | ...HLino....mntrRGB XYZ ........
204204
VP8 | 172008 | 3182 | .G...*.. .>1..B.!..o.. ......]..
205205
EXIF | 12040 | 175198 | II*........................... .
206-
XMP | 2864 | 187246 | <?xpacket begin="..." id="W5M0Mp
206+
XMP | 2858 | 187246 | <?xpacket begin="..." id="W5M0Mp

‎test/data/test_reference_files/webp-test.out‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
4040
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
4141
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
4242
Chunk | Length | Offset | Payload
43-
RIFF | 186958 | 0 | WEBP
43+
RIFF | 186952 | 0 | WEBP
4444
VP8X | 10 | 12 | .........
4545
VP8 | 172008 | 30 | .G...*.. .>1..B.!..o.. ......]..
4646
EXIF | 12040 | 172046 | II*........................... .
47-
XMP | 2864 | 184094 | <?xpacket begin="..." id="W5M0Mp
47+
XMP | 2858 | 184094 | <?xpacket begin="..." id="W5M0Mp
4848
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
4949
Chunk | Length | Offset | Payload
5050
RIFF | 187526 | 0 | WEBP
@@ -55,11 +55,11 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
5555
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
5656
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
5757
Chunk | Length | Offset | Payload
58-
RIFF | 175478 | 0 | WEBP
58+
RIFF | 175472 | 0 | WEBP
5959
VP8X | 10 | 12 | $........
6060
ICCP | 560 | 30 | ...0ADBE....mntrRGB XYZ ........
6161
VP8 | 172008 | 598 | .G...*.. .>1..B.!..o.. ......]..
62-
XMP | 2864 | 172614 | <?xpacket begin="..." id="W5M0Mp
62+
XMP | 2858 | 172614 | <?xpacket begin="..." id="W5M0Mp
6363
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
6464
Chunk | Length | Offset | Payload
6565
RIFF | 187526 | 0 | WEBP
@@ -85,10 +85,10 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
8585
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
8686
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
8787
Chunk | Length | Offset | Payload
88-
RIFF | 174910 | 0 | WEBP
88+
RIFF | 174904 | 0 | WEBP
8989
VP8X | 10 | 12 | .........
9090
VP8 | 172008 | 30 | .G...*.. .>1..B.!..o.. ......]..
91-
XMP | 2864 | 172046 | <?xpacket begin="..." id="W5M0Mp
91+
XMP | 2858 | 172046 | <?xpacket begin="..." id="W5M0Mp
9292
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
9393
Chunk | Length | Offset | Payload
9494
RIFF | 187526 | 0 | WEBP
@@ -126,12 +126,12 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
126126
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
127127
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
128128
Chunk | Length | Offset | Payload
129-
RIFF | 190110 | 0 | WEBP
129+
RIFF | 190104 | 0 | WEBP
130130
VP8X | 10 | 12 | ,........
131131
ICCP | 3144 | 30 | ...HLino....mntrRGB XYZ ........
132132
VP8 | 172008 | 3182 | .G...*.. .>1..B.!..o.. ......]..
133133
EXIF | 12040 | 175198 | II*........................... .
134-
XMP | 2864 | 187246 | <?xpacket begin="..." id="W5M0Mp
134+
XMP | 2858 | 187246 | <?xpacket begin="..." id="W5M0Mp
135135
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
136136
Chunk | Length | Offset | Payload
137137
RIFF | 187526 | 0 | WEBP
@@ -142,12 +142,12 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
142142
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
143143
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
144144
Chunk | Length | Offset | Payload
145-
RIFF | 187526 | 0 | WEBP
145+
RIFF | 187520 | 0 | WEBP
146146
VP8X | 10 | 12 | ,........
147147
ICCP | 560 | 30 | ...0ADBE....mntrRGB XYZ ........
148148
VP8 | 172008 | 598 | .G...*.. .>1..B.!..o.. ......]..
149149
EXIF | 12040 | 172614 | II*........................... .
150-
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
150+
XMP | 2858 | 184662 | <?xpacket begin="..." id="W5M0Mp
151151
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
152152
Chunk | Length | Offset | Payload
153153
RIFF | 187526 | 0 | WEBP
@@ -158,12 +158,12 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
158158
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
159159
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
160160
Chunk | Length | Offset | Payload
161-
RIFF | 189324 | 0 | WEBP
161+
RIFF | 189318 | 0 | WEBP
162162
VP8X | 10 | 12 | ,........
163163
ICCP | 560 | 30 | ...0ADBE....mntrRGB XYZ ........
164164
VP8 | 172008 | 598 | .G...*.. .>1..B.!..o.. ......]..
165165
EXIF | 12040 | 172614 | II*........................... .
166-
XMP | 4661 | 184662 | <?xpacket begin="..." id="W5M0Mp
166+
XMP | 4655 | 184662 | <?xpacket begin="..." id="W5M0Mp
167167
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
168168
Chunk | Length | Offset | Payload
169169
RIFF | 187526 | 0 | WEBP
@@ -174,20 +174,20 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
174174
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
175175
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
176176
Chunk | Length | Offset | Payload
177-
RIFF | 188070 | 0 | WEBP
177+
RIFF | 188064 | 0 | WEBP
178178
VP8X | 10 | 12 | ,........
179179
ICCP | 560 | 30 | ...0ADBE....mntrRGB XYZ ........
180180
VP8 | 172008 | 598 | .G...*.. .>1..B.!..o.. ......]..
181181
EXIF | 12040 | 172614 | II*........................... .
182-
XMP | 3407 | 184662 | <?xpacket begin="..." id="W5M0Mp
182+
XMP | 3401 | 184662 | <?xpacket begin="..." id="W5M0Mp
183183
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
184184
Chunk | Length | Offset | Payload
185-
RIFF | 1864146 | 0 | WEBP
185+
RIFF | 1864140 | 0 | WEBP
186186
VP8X | 10 | 12 | ,........
187187
ICCP | 560 | 30 | ...0ADBE....mntrRGB XYZ ........
188188
VP8 | 172008 | 598 | .G...*.. .>1..B.!..o.. ......]..
189189
EXIF | 12040 | 172614 | II*........................... .
190-
XMP | 1679484 | 184662 | <?xpacket begin="..." id="W5M0Mp
190+
XMP | 1679478 | 184662 | <?xpacket begin="..." id="W5M0Mp
191191
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
192192
Chunk | Length | Offset | Payload
193193
RIFF | 187526 | 0 | WEBP
@@ -198,9 +198,9 @@ STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
198198
XMP | 2864 | 184662 | <?xpacket begin="..." id="W5M0Mp
199199
STRUCTURE OF WEBP FILE: exiv2-bug1199.webp
200200
Chunk | Length | Offset | Payload
201-
RIFF | 187684 | 0 | WEBP
201+
RIFF | 187678 | 0 | WEBP
202202
VP8X | 10 | 12 | ,........
203203
ICCP | 560 | 30 | ...0ADBE....mntrRGB XYZ ........
204204
VP8 | 172008 | 598 | .G...*.. .>1..B.!..o.. ......]..
205205
EXIF | 12198 | 172614 | II*.............................
206-
XMP | 2864 | 184820 | <?xpacket begin="..." id="W5M0Mp
206+
XMP | 2858 | 184820 | <?xpacket begin="..." id="W5M0Mp

0 commit comments

Comments
 (0)