[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:42:40 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a4c1d3f
The following commit has been merged in the master branch:
commit a4c1d3f5b54c1b705adcbfbd1f6bfba50a8dc7b6
Author: vog <vog at notjusthosting.com>
Date: Mon Aug 22 21:57:00 2011 +0000
Changed version number in EPS files to the fixed length hex version number, to simplify testing DOS EPS files
---
src/epsimage.cpp | 4 ++--
test/data/eps/eps-flat_empty-xmp.eps | 2 +-
...s-flat_minimal_xmp-garbage-before-endmarker.eps | 2 +-
test/data/eps/eps-flat_minimal_xmp-in-page.eps | 2 +-
.../eps-flat_minimal_xmp-in-page_exiftool-8.56.eps | 2 +-
test/data/eps/eps-flat_minimal_xmp-readonly.eps | 2 +-
.../eps/eps-flat_minimal_xmp-singlequote-begin.eps | 2 +-
.../eps/eps-flat_minimal_xmp-singlequote-end.eps | 2 +-
.../eps/eps-flat_minimal_xmp-singlequote-id.eps | 2 +-
test/data/eps/eps-flat_minimal_xmp.eps | 2 +-
.../eps/eps-flat_minimal_xmp_exiftool-8.56.eps | 2 +-
.../eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps | 2 +-
...s-flat_photoshop-cs5-binary_exiv2-bug-r2561.eps | 2 +-
.../eps/eps-flat_photoshop-cs5-binary_exiv2.eps | 2 +-
...p-cs5-binary_exiv2_missing-begin-xml-packet.eps | 2 +-
test/data/eps/eps-flat_photoshop-e9-win_exiv2.eps | 2 +-
test/data/eps/eps-nested_xmp_ai-3-lev3.eps | Bin 38304 -> 38304 bytes
test/data/eps/eps-nested_xmp_ai-8-lev3.eps | Bin 275040 -> 275040 bytes
test/data/eps/eps-nested_xmp_ai-cs5-lev3.eps | Bin 460944 -> 460944 bytes
.../eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps | Bin 182722 -> 182722 bytes
test/data/eps/eps-nested_xmp_indesign-cs5-lev3.eps | Bin 182804 -> 182804 bytes
...-nested_xmp_indesign-cs5-lev3_exiftool-8.56.eps | Bin 186525 -> 186525 bytes
test/data/eps/eps-nested_xmp_oodraw-lev2-epsi.eps | 2 +-
test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps | Bin 18231 -> 18231 bytes
test/data/eps/eps-nested_xmp_oodraw-lev2.eps | 2 +-
test/eps-test.sh | 2 +-
26 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index a6c3a8b..69d310a 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -872,7 +872,7 @@ namespace {
}
}
if (pos == posExiv2Version && posExiv2Version != posEndEps) {
- writeTemp(*tempIo, "%Exiv2Version: " + std::string(version()) + lineEnding);
+ writeTemp(*tempIo, "%Exiv2Version: " + versionNumberHexString() + lineEnding);
skipPos = posLineEnd;
}
if (pos == posExiv2Website && posExiv2Website != posEndEps) {
@@ -890,7 +890,7 @@ namespace {
writeTemp(*tempIo, "%%Pages: 1" + lineEnding);
}
if (posExiv2Version == posEndEps) {
- writeTemp(*tempIo, "%Exiv2Version: " + std::string(version()) + lineEnding);
+ writeTemp(*tempIo, "%Exiv2Version: " + versionNumberHexString() + lineEnding);
}
if (posExiv2Website == posEndEps) {
writeTemp(*tempIo, "%Exiv2Website: http://www.exiv2.org/" + lineEnding);
diff --git a/test/data/eps/eps-flat_empty-xmp.eps b/test/data/eps/eps-flat_empty-xmp.eps
index de58151..e09cdd2 100644
--- a/test/data/eps/eps-flat_empty-xmp.eps
+++ b/test/data/eps/eps-flat_empty-xmp.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps b/test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps
index 5747f3a..83e43b7 100644
--- a/test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-flat_minimal_xmp-in-page.eps b/test/data/eps/eps-flat_minimal_xmp-in-page.eps
index 8f77f40..ef85f76 100644
--- a/test/data/eps/eps-flat_minimal_xmp-in-page.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-in-page.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
10 setlinewidth
diff --git a/test/data/eps/eps-flat_minimal_xmp-in-page_exiftool-8.56.eps b/test/data/eps/eps-flat_minimal_xmp-in-page_exiftool-8.56.eps
index 9f63a05..b04d275 100644
--- a/test/data/eps/eps-flat_minimal_xmp-in-page_exiftool-8.56.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-in-page_exiftool-8.56.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%begin_xml_code
diff --git a/test/data/eps/eps-flat_minimal_xmp-readonly.eps b/test/data/eps/eps-flat_minimal_xmp-readonly.eps
index 671fc79..ca24e1c 100644
--- a/test/data/eps/eps-flat_minimal_xmp-readonly.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-readonly.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-flat_minimal_xmp-singlequote-begin.eps b/test/data/eps/eps-flat_minimal_xmp-singlequote-begin.eps
index 8c9d3a0..1d5b01f 100644
--- a/test/data/eps/eps-flat_minimal_xmp-singlequote-begin.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-singlequote-begin.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-flat_minimal_xmp-singlequote-end.eps b/test/data/eps/eps-flat_minimal_xmp-singlequote-end.eps
index 048aed6..11cf93c 100644
--- a/test/data/eps/eps-flat_minimal_xmp-singlequote-end.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-singlequote-end.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-flat_minimal_xmp-singlequote-id.eps b/test/data/eps/eps-flat_minimal_xmp-singlequote-id.eps
index d2af182..bd0c308 100644
--- a/test/data/eps/eps-flat_minimal_xmp-singlequote-id.eps
+++ b/test/data/eps/eps-flat_minimal_xmp-singlequote-id.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-flat_minimal_xmp.eps b/test/data/eps/eps-flat_minimal_xmp.eps
index 911cc4c..025f7ca 100644
--- a/test/data/eps/eps-flat_minimal_xmp.eps
+++ b/test/data/eps/eps-flat_minimal_xmp.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-flat_minimal_xmp_exiftool-8.56.eps b/test/data/eps/eps-flat_minimal_xmp_exiftool-8.56.eps
index d4ae764..35551ad 100644
--- a/test/data/eps/eps-flat_minimal_xmp_exiftool-8.56.eps
+++ b/test/data/eps/eps-flat_minimal_xmp_exiftool-8.56.eps
@@ -3,7 +3,7 @@
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%begin_xml_code
diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
index 62948bf..54699af 100644
--- a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
+++ b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
@@ -1,4 +1,4 @@
-%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 0.21.1
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
%begin_xml_packet: 67908
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
%begin_xml_packet: 67908
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bug-r2561.eps b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bug-r2561.eps
index fbad153..d99b715 100644
--- a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bug-r2561.eps
+++ b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bug-r2561.eps
@@ -1,4 +1,4 @@
-%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 0.21.1
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%ImageData: 37 47 8 3 1 37 1 "beginimage"
%BeginPhotoshop: 3384
% 3842494D0425000000000010000000000000000000000000000000003842494D
% 043A0000000000F1000000100000000100000000000B7072696E744F75747075
% 740000000600000000436C7253656E756D00000000436C72530000000045434D
% 59000000004E6D2020544558540000001900500068006F0074006F0073006800
% 6F007000200034002000440065006600610075006C007400200043004D005900
% 4B000000000000496E7465656E756D00000000496E746500000000436C726D00
% 0000004D70426C626F6F6C010000000F7072696E745369787465656E42697462
% 6F6F6C000000000B7072696E7465724E616D65544558540000000F0031003700
% 32002E00320038002E003100370036002E0031003000310000003842494D043B
% 0000000001B200000010000000010000000000127072696E744F75747075744F
% 7074696F6E7300000012000000004370746E626F6F6C0000000000436C627262
% 6F6F6C00000000005267734D626F6F6C000000000043726E43626F6F6C000000
% 0000436E7443626F6F6C00000000004C626C73626F6F6C00000000004E677476
% 626F6F6C0000000000456D6C44626F6F6C0000000000496E7472626F6F6C0000
% 00000042636B674F626A63000000010000000000005247424300000003000000
% 0052642020646F7562406FE000000000000000000047726E20646F7562406FE0
% 000000000000000000426C2020646F7562406FE0000000000000000000427264
% 54556E744623526C74000000000000000000000000426C6420556E744623526C
% 7400000000000000000000000052736C74556E74462350786C406E0000000000
% 000000000A766563746F7244617461626F6F6C010000000050675073656E756D
% 00000000506750730000000050675043000000004C656674556E744623526C74
% 000000000000000000000000546F7020556E744623526C740000000000000000
% 0000000053636C20556E74462350726340590000000000003842494D03ED0000
% 0000001000F000000001000200F00000000100023842494D042600000000000E
% 000000000000000000003F8000003842494D040D000000000004000000783842
% 494D04190000000000040000001E3842494D03F3000000000009000000000000
% 000001003842494D271000000000000A000100000000000000023842494D03F5
% 000000000048002F66660001006C66660006000000000001002F6666000100A1
% 999A0006000000000001003200000001005A0000000600000000000100350000
% 0001002D000000060000000000013842494D03F80000000000700000FFFFFFFF
% FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF03E800000000FFFFFFFFFFFFFFFF
% FFFFFFFFFFFFFFFFFFFFFFFFFFFF03E800000000FFFFFFFFFFFFFFFFFFFFFFFF
% FFFFFFFFFFFFFFFFFFFF03E800000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
% FFFFFFFFFFFF03E800003842494D040800000000001000000001000002400000
% 0240000000003842494D041E000000000004000000003842494D041A00000000
% 03710000000600000000000000000000002F000000250000001E007A0073005F
% 00700068006F0074006F00730068006F0070002D006300730035002D00610073
% 006300690069002D007000720065007600690065007700000001000000000000
% 00000000000000000000000000010000000000000000000000250000002F0000
% 0000000000000000000000000000010000000000000000000000000000000000
% 000010000000010000000000006E756C6C0000000200000006626F756E64734F
% 626A6300000001000000000000526374310000000400000000546F70206C6F6E
% 6700000000000000004C6566746C6F6E67000000000000000042746F6D6C6F6E
% 670000002F00000000526768746C6F6E670000002500000006736C6963657356
% 6C4C73000000014F626A6300000001000000000005736C696365000000120000
% 0007736C69636549446C6F6E67000000000000000767726F757049446C6F6E67
% 00000000000000066F726967696E656E756D0000000C45536C6963654F726967
% 696E0000000D6175746F47656E6572617465640000000054797065656E756D00
% 00000A45536C6963655479706500000000496D672000000006626F756E64734F
% 626A6300000001000000000000526374310000000400000000546F70206C6F6E
% 6700000000000000004C6566746C6F6E67000000000000000042746F6D6C6F6E
% 670000002F00000000526768746C6F6E67000000250000000375726C54455854
% 000000010000000000006E756C6C54455854000000010000000000004D736765
% 5445585400000001000000000006616C74546167544558540000000100000000
% 000E63656C6C54657874497348544D4C626F6F6C010000000863656C6C546578
% 745445585400000001000000000009686F727A416C69676E656E756D0000000F
% 45536C696365486F727A416C69676E0000000764656661756C74000000097665
% 7274416C69676E656E756D0000000F45536C69636556657274416C69676E0000
% 000764656661756C740000000B6267436F6C6F7254797065656E756D00000011
% 45536C6963654247436F6C6F7254797065000000004E6F6E6500000009746F70
% 4F75747365746C6F6E67000000000000000A6C6566744F75747365746C6F6E67
% 000000000000000C626F74746F6D4F75747365746C6F6E67000000000000000B
% 72696768744F75747365746C6F6E6700000000003842494D042800000000000C
% 000000023FF00000000000003842494D041100000000000101003842494D0414
% 000000000004000000013842494D040C00000000037200000001000000250000
% 002F00000070000014900000035600180001FFD8FFED000C41646F62655F434D
% 0001FFEE000E41646F626500648000000001FFDB0084000C08080809080C0909
% 0C110B0A0B11150F0C0C0F1518131315131318110C0C0C0C0C0C110C0C0C0C0C
% 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C010D0B0B0D0E0D100E
% 0E10140E0E0E14140E0E0E0E14110C0C0C0C0C11110C0C0C0C0C0C110C0C0C0C
% 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0CFFC0001108002F00
% 2503012200021101031101FFDD00040003FFC4013F0000010501010101010100
% 000000000000030001020405060708090A0B0100010501010101010100000000
% 000000010002030405060708090A0B1000010401030204020507060805030C33
% 010002110304211231054151611322718132061491A1B14223241552C1623334
% 7282D14307259253F0E1F163733516A2B283264493546445C2A3743617D255E2
% 65F2B384C3D375E3F3462794A485B495C4D4E4F4A5B5C5D5E5F55666768696A6
% B6C6D6E6F637475767778797A7B7C7D7E7F71100020201020404030405060707
% 0605350100021103213112044151617122130532819114A1B14223C152D1F033
% 2462E1728292435315637334F1250616A2B283072635C2D2449354A317644555
% 367465E2F2B384C3D375E3F34694A485B495C4D4E4F4A5B5C5D5E5F556667686
% 96A6B6C6D6E6F62737475767778797A7B7C7FFDA000C03010002110311003F00
% F5549729D6BEB6BB033863B5B22752B7FA6E7D79D8CDB987909A2712481B867C
% 9CAE5C78E39243D33D8B71242C9C8AF1AA36D861A166E07D63C2CEBCD353A5C1
% 13200D13BB1C7164944CA312631DCBAE92649158FF00FFD0D9FAEFD21CD7FDB1
% 834EE81F53BAEFD9EDFB2DCEF6BB895DD750C3AF3319D4BC4C85E57D6302DE97
% 9EE68900196955728309F18D8BBBC8E48735CB9E5B27CD11E92F4FF5CFAE37D3
% 18D43BE9730A97D47C0B2CCA3927E885818D4E4F54CB6D725CE71E7C97A5F42C
% 1A3A6E2B6991BC8D5285E4C9C47609E6B8394E53D886B927BBAD1A4249488949
% 5A705FFFD1F555CF7D64FAB6DEA8D0E67B6C1DD74292128890A2C98734F14C4E
% 06A41E67EAFF00D566F4D9B6C3BADEC553CBC4EB47AD35F5B8FD9E750BB25022
% B9D62533DA1400D299C73D93DC964981394C70FABA7923DB67D9A3F3A1246D12
% 4FA6B717E76FFFD93842494D042100000000005500000001010000000F004100
% 64006F00620065002000500068006F0074006F00730068006F00700000001300
% 410064006F00620065002000500068006F0074006F00730068006F0070002000
% 430053003500000001003842494D042200000000012E4D4D002A000000080007
% 011200030000000100010000011A00050000000100000062011B000500000001
% 0000006A012800030000000100020000013100020000001E0000007201320002
% 00000014000000908769000400000001000000A4000000D000249F0000002710
% 00249F000000271041646F62652050686F746F73686F7020435335204D616369
% 6E746F736800323031313A30333A32352031373A32353A3537000003A0010003
% 00000001FFFF0000A00200040000000100000025A0030004000000010000002F
% 0000000000000006010300030000000100060000011A0005000000010000011E
% 011B000500000001000001260128000300000001000200000201000400000001
% 0000012E02020004000000010000000000000000000000480000000100000048
% 000000013842494D03FD0000000000080000000000000000
%EndPhotoshop
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
%begin_xml_packet: 2392
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%ImageData: 37 47 8 3 1 37 1 "beginimage"
%BeginPhotoshop: 3384
% 3842494D0425000000000010000000000000000000000000000000003842494D
% 043A0000000000F1000000100000000100000000000B7072696E744F75747075
% 740000000600000000436C7253656E756D00000000436C72530000000045434D
% 59000000004E6D2020544558540000001900500068006F0074006F0073006800
% 6F007000200034002000440065006600610075006C007400200043004D005900
% 4B000000000000496E7465656E756D00000000496E746500000000436C726D00
% 0000004D70426C626F6F6C010000000F7072696E745369787465656E42697462
% 6F6F6C000000000B7072696E7465724E616D65544558540000000F0031003700
% 32002E00320038002E003100370036002E0031003000310000003842494D043B
% 0000000001B200000010000000010000000000127072696E744F75747075744F
% 7074696F6E7300000012000000004370746E626F6F6C0000000000436C627262
% 6F6F6C00000000005267734D626F6F6C000000000043726E43626F6F6C000000
% 0000436E7443626F6F6C00000000004C626C73626F6F6C00000000004E677476
% 626F6F6C0000000000456D6C44626F6F6C0000000000496E7472626F6F6C0000
% 00000042636B674F626A63000000010000000000005247424300000003000000
% 0052642020646F7562406FE000000000000000000047726E20646F7562406FE0
% 000000000000000000426C2020646F7562406FE0000000000000000000427264
% 54556E744623526C74000000000000000000000000426C6420556E744623526C
% 7400000000000000000000000052736C74556E74462350786C406E0000000000
% 000000000A766563746F7244617461626F6F6C010000000050675073656E756D
% 00000000506750730000000050675043000000004C656674556E744623526C74
% 000000000000000000000000546F7020556E744623526C740000000000000000
% 0000000053636C20556E74462350726340590000000000003842494D03ED0000
% 0000001000F000000001000200F00000000100023842494D042600000000000E
% 000000000000000000003F8000003842494D040D000000000004000000783842
% 494D04190000000000040000001E3842494D03F3000000000009000000000000
% 000001003842494D271000000000000A000100000000000000023842494D03F5
% 000000000048002F66660001006C66660006000000000001002F6666000100A1
% 999A0006000000000001003200000001005A0000000600000000000100350000
% 0001002D000000060000000000013842494D03F80000000000700000FFFFFFFF
% FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF03E800000000FFFFFFFFFFFFFFFF
% FFFFFFFFFFFFFFFFFFFFFFFFFFFF03E800000000FFFFFFFFFFFFFFFFFFFFFFFF
% FFFFFFFFFFFFFFFFFFFF03E800000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
% FFFFFFFFFFFF03E800003842494D040800000000001000000001000002400000
% 0240000000003842494D041E000000000004000000003842494D041A00000000
% 03710000000600000000000000000000002F000000250000001E007A0073005F
% 00700068006F0074006F00730068006F0070002D006300730035002D00610073
% 006300690069002D007000720065007600690065007700000001000000000000
% 00000000000000000000000000010000000000000000000000250000002F0000
% 0000000000000000000000000000010000000000000000000000000000000000
% 000010000000010000000000006E756C6C0000000200000006626F756E64734F
% 626A6300000001000000000000526374310000000400000000546F70206C6F6E
% 6700000000000000004C6566746C6F6E67000000000000000042746F6D6C6F6E
% 670000002F00000000526768746C6F6E670000002500000006736C6963657356
% 6C4C73000000014F626A6300000001000000000005736C696365000000120000
% 0007736C69636549446C6F6E67000000000000000767726F757049446C6F6E67
% 00000000000000066F726967696E656E756D0000000C45536C6963654F726967
% 696E0000000D6175746F47656E6572617465640000000054797065656E756D00
% 00000A45536C6963655479706500000000496D672000000006626F756E64734F
% 626A6300000001000000000000526374310000000400000000546F70206C6F6E
% 6700000000000000004C6566746C6F6E67000000000000000042746F6D6C6F6E
% 670000002F00000000526768746C6F6E67000000250000000375726C54455854
% 000000010000000000006E756C6C54455854000000010000000000004D736765
% 5445585400000001000000000006616C74546167544558540000000100000000
% 000E63656C6C54657874497348544D4C626F6F6C010000000863656C6C546578
% 745445585400000001000000000009686F727A416C69676E656E756D0000000F
% 45536C696365486F727A416C69676E0000000764656661756C74000000097665
% 7274416C69676E656E756D0000000F45536C69636556657274416C69676E0000
% 000764656661756C740000000B6267436F6C6F7254797065656E756D00000011
% 45536C6963654247436F6C6F7254797065000000004E6F6E6500000009746F70
% 4F75747365746C6F6E67000000000000000A6C6566744F75747365746C6F6E67
% 000000000000000C626F74746F6D4F75747365746C6F6E67000000000000000B
% 72696768744F75747365746C6F6E6700000000003842494D042800000000000C
% 000000023FF00000000000003842494D041100000000000101003842494D0414
% 000000000004000000013842494D040C00000000037200000001000000250000
% 002F00000070000014900000035600180001FFD8FFED000C41646F62655F434D
% 0001FFEE000E41646F626500648000000001FFDB0084000C08080809080C0909
% 0C110B0A0B11150F0C0C0F1518131315131318110C0C0C0C0C0C110C0C0C0C0C
% 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C010D0B0B0D0E0D100E
% 0E10140E0E0E14140E0E0E0E14110C0C0C0C0C11110C0C0C0C0C0C110C0C0C0C
% 0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0C0CFFC0001108002F00
% 2503012200021101031101FFDD00040003FFC4013F0000010501010101010100
% 000000000000030001020405060708090A0B0100010501010101010100000000
% 000000010002030405060708090A0B1000010401030204020507060805030C33
% 010002110304211231054151611322718132061491A1B14223241552C1623334
% 7282D14307259253F0E1F163733516A2B283264493546445C2A3743617D255E2
% 65F2B384C3D375E3F3462794A485B495C4D4E4F4A5B5C5D5E5F55666768696A6
% B6C6D6E6F637475767778797A7B7C7D7E7F71100020201020404030405060707
% 0605350100021103213112044151617122130532819114A1B14223C152D1F033
% 2462E1728292435315637334F1250616A2B283072635C2D2449354A317644555
% 367465E2F2B384C3D375E3F34694A485B495C4D4E4F4A5B5C5D5E5F556667686
% 96A6B6C6D6E6F62737475767778797A7B7C7FFDA000C03010002110311003F00
% F5549729D6BEB6BB033863B5B22752B7FA6E7D79D8CDB987909A2712481B867C
% 9CAE5C78E39243D33D8B71242C9C8AF1AA36D861A166E07D63C2CEBCD353A5C1
% 13200D13BB1C7164944CA312631DCBAE92649158FF00FFD0D9FAEFD21CD7FDB1
% 834EE81F53BAEFD9EDFB2DCEF6BB895DD750C3AF3319D4BC4C85E57D6302DE97
% 9EE68900196955728309F18D8BBBC8E48735CB9E5B27CD11E92F4FF5CFAE37D3
% 18D43BE9730A97D47C0B2CCA3927E885818D4E4F54CB6D725CE71E7C97A5F42C
% 1A3A6E2B6991BC8D5285E4C9C47609E6B8394E53D886B927BBAD1A4249488949
% 5A705FFFD1F555CF7D64FAB6DEA8D0E67B6C1DD74292128890A2C98734F14C4E
% 06A41E67EAFF00D566F4D9B6C3BADEC553CBC4EB47AD35F5B8FD9E750BB25022
% B9D62533DA1400D299C73D93DC964981394C70FABA7923DB67D9A3F3A1246D12
% 4FA6B717E76FFFD93842494D042100000000005500000001010000000F004100
% 64006F00620065002000500068006F0074006F00730068006F00700000001300
% 410064006F00620065002000500068006F0074006F00730068006F0070002000
% 430053003500000001003842494D042200000000012E4D4D002A000000080007
% 011200030000000100010000011A00050000000100000062011B000500000001
% 0000006A012800030000000100020000013100020000001E0000007201320002
% 00000014000000908769000400000001000000A4000000D000249F0000002710
% 00249F000000271041646F62652050686F746F73686F7020435335204D616369
% 6E746F736800323031313A30333A32352031373A32353A3537000003A0010003
% 00000001FFFF0000A00200040000000100000025A0030004000000010000002F
% 0000000000000006010300030000000100060000011A0005000000010000011E
% 011B000500000001000001260128000300000001000200000201000400000001
% 0000012E02020004000000010000000000000000000000480000000100000048
% 000000013842494D03FD0000000000080000000000000000
%EndPhotoshop
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
%begin_xml_packet: 2392
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2.eps b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2.eps
index b22b0bf..aaf47ca 100644
--- a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2.eps
+++ b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2.eps
@@ -1,4 +1,4 @@
-%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 0.21.1
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
%begin_xml_packet: 2392
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
%begin_xml_packet: 2392
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
index 34bfa4c..58ab89c 100644
--- a/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
+++ b/test/data/eps/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
@@ -1,4 +1,4 @@
-%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 0.21.1
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+%!PS-Adobe-3.0 EPSF-3.0
%%Creator: Adobe Photoshop Version 12.0.2x20101122 [20101122.r.1204 2010/11/22:02:00:00 cutoff; r branch]
%%Title: zs_photoshop-cs5-binary.eps
%%CreationDate: 3/25/11 5:26 PM
%%BoundingBox: 0 0 11 14
%%HiResBoundingBox: 0 0 11.1 14.1
%%SuppressDotGainCompensation
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
%%EndProlog
%%BeginSetup
%%EndSetup
%%Page: 1 1
%%EndPageComments
%%BeginPageSetup
%Exiv2BeginXMP: Before %%EndPageSetup
%Exiv2Notice: The following line is needed by Photoshop.
%begin_xml_code
/currentdistillerparams where
{pop currentdistillerparams /CoreDistVersion get 5000 lt} {true} ifelse
{userdict /Exiv2_pdfmark /cleartomark load put
userdict /Exiv2_metafile_pdfmark {flushfile cleartomark} bind put}
{userdict /Exiv2_pdfmark /pdfmark load put
userdict /Exiv2_metafile_pdfmark {/PUT pdfmark} bind put} ifelse
[/NamespacePush Exiv2_pdfmark
[/_objdef {Exiv2_metadata_stream} /type /stream /OBJ Exiv2_pdfmark
[{Exiv2_metadata_stream} 2 dict begin
/Type /Metadata def /Subtype /XML def currentdict end /PUT Exiv2_pdfmark
[{Exiv2_metadata_stream}
currentfile 0 (% &&end XMP packet marker&&)
/SubFileDecode filter Exiv2_metafile_pdfmark
%Exiv2Notice: The following line is needed by Photoshop. Parameter must be exact size of XMP metadata.
<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
diff --git a/test/data/eps/eps-flat_photoshop-e9-win_exiv2.eps b/test/data/eps/eps-flat_photoshop-e9-win_exiv2.eps
index 49308f7..6ba8bc0 100644
--- a/test/data/eps/eps-flat_photoshop-e9-win_exiv2.eps
+++ b/test/data/eps/eps-flat_photoshop-e9-win_exiv2.eps
@@ -7,7 +7,7 @@
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog
diff --git a/test/data/eps/eps-nested_xmp_ai-3-lev3.eps b/test/data/eps/eps-nested_xmp_ai-3-lev3.eps
index ebe3407..eb9e64a 100644
Binary files a/test/data/eps/eps-nested_xmp_ai-3-lev3.eps and b/test/data/eps/eps-nested_xmp_ai-3-lev3.eps differ
diff --git a/test/data/eps/eps-nested_xmp_ai-8-lev3.eps b/test/data/eps/eps-nested_xmp_ai-8-lev3.eps
index 1c64703..5b4017a 100644
Binary files a/test/data/eps/eps-nested_xmp_ai-8-lev3.eps and b/test/data/eps/eps-nested_xmp_ai-8-lev3.eps differ
diff --git a/test/data/eps/eps-nested_xmp_ai-cs5-lev3.eps b/test/data/eps/eps-nested_xmp_ai-cs5-lev3.eps
index 685d7b5..3a8b29f 100644
Binary files a/test/data/eps/eps-nested_xmp_ai-cs5-lev3.eps and b/test/data/eps/eps-nested_xmp_ai-cs5-lev3.eps differ
diff --git a/test/data/eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps b/test/data/eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps
index 8af2ab1..41a47f4 100644
Binary files a/test/data/eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps and b/test/data/eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps differ
diff --git a/test/data/eps/eps-nested_xmp_indesign-cs5-lev3.eps b/test/data/eps/eps-nested_xmp_indesign-cs5-lev3.eps
index 7022788..bef917b 100644
Binary files a/test/data/eps/eps-nested_xmp_indesign-cs5-lev3.eps and b/test/data/eps/eps-nested_xmp_indesign-cs5-lev3.eps differ
diff --git a/test/data/eps/eps-nested_xmp_indesign-cs5-lev3_exiftool-8.56.eps b/test/data/eps/eps-nested_xmp_indesign-cs5-lev3_exiftool-8.56.eps
index 87b0598..fe90fe8 100644
Binary files a/test/data/eps/eps-nested_xmp_indesign-cs5-lev3_exiftool-8.56.eps and b/test/data/eps/eps-nested_xmp_indesign-cs5-lev3_exiftool-8.56.eps differ
diff --git a/test/data/eps/eps-nested_xmp_oodraw-lev2-epsi.eps b/test/data/eps/eps-nested_xmp_oodraw-lev2-epsi.eps
index 3f494d3..5cb9681 100644
--- a/test/data/eps/eps-nested_xmp_oodraw-lev2-epsi.eps
+++ b/test/data/eps/eps-nested_xmp_oodraw-lev2-epsi.eps
@@ -1648,7 +1648,7 @@ tm setmatrix
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps b/test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps
index 8c39a60..f87958a 100644
Binary files a/test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps and b/test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps differ
diff --git a/test/data/eps/eps-nested_xmp_oodraw-lev2.eps b/test/data/eps/eps-nested_xmp_oodraw-lev2.eps
index 0022d42..d7dc7d4 100644
--- a/test/data/eps/eps-nested_xmp_oodraw-lev2.eps
+++ b/test/data/eps/eps-nested_xmp_oodraw-lev2.eps
@@ -76,7 +76,7 @@ tm setmatrix
%%LanguageLevel: 2
%ADO_ContainsXMP: MainFirst
%%Pages: 1
-%Exiv2Version: 0.21.1
+%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%Page: 1 1
diff --git a/test/eps-test.sh b/test/eps-test.sh
index 7eb38ab..617ecdd 100755
--- a/test/eps-test.sh
+++ b/test/eps-test.sh
@@ -12,7 +12,7 @@ else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
-exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 \([^ ]*\).*,,p'`"
+exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 [^ ]* \([^ ]*\).*,,p'`"
if [ -z "$exiv2version" ]; then
echo "Error: Unable to determine Exiv2 version"
exit 1
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list