xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed version number in EPS files to the fixed length hex version number, to simplify testing DOS EPS files

Browse Source
v0.27.3
vog 14 years ago
parent 2ae0bcf7b8
commit a4c1d3f5b5
26 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

4
src/epsimage.cpp
Unescape Escape View File

@ -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);

2
test/data/eps/eps-flat_empty-xmp.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp-garbage-before-endmarker.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp-in-page.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp-in-page_exiftool-8.56.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp-readonly.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp-singlequote-begin.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp-singlequote-end.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp-singlequote-id.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_minimal_xmp_exiftool-8.56.eps
Unescape Escape View File

@ -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

2
test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
Unescape Escape View File

@ -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=""

2
test/data/eps/eps-flat_photoshop-cs5-binary_exiv2-bug-r2561.eps
View File

File diff suppressed because one or more lines are too long

2
test/data/eps/eps-flat_photoshop-cs5-binary_exiv2.eps
Unescape Escape View File

@ -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=""

2
test/data/eps/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
Unescape Escape View File

@ -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=""

2
test/data/eps/eps-flat_photoshop-e9-win_exiv2.eps
Unescape Escape View File

@ -7,7 +7,7 @@
%ADO_ContainsXMP: MainFirst
%%LanguageLevel: 2
%%Pages: 1
%Exiv2Version: 0.21.1
%Exiv2Version: 001500
%Exiv2Website: http://www.exiv2.org/
%%EndComments
%%BeginProlog

BIN
test/data/eps/eps-nested_xmp_ai-3-lev3.eps
View File

Binary file not shown.

BIN
test/data/eps/eps-nested_xmp_ai-8-lev3.eps
View File

Binary file not shown.

BIN
test/data/eps/eps-nested_xmp_ai-cs5-lev3.eps
View File

Binary file not shown.

BIN
test/data/eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps
View File

Binary file not shown.

BIN
test/data/eps/eps-nested_xmp_indesign-cs5-lev3.eps
View File

Binary file not shown.

BIN
test/data/eps/eps-nested_xmp_indesign-cs5-lev3_exiftool-8.56.eps
View File

Binary file not shown.

2
test/data/eps/eps-nested_xmp_oodraw-lev2-epsi.eps
Unescape Escape View File

@ -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

BIN
test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps
View File

Binary file not shown.

2
test/data/eps/eps-nested_xmp_oodraw-lev2.eps
Unescape Escape View File

@ -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

2
test/eps-test.sh
Unescape Escape View File

@ -12,7 +12,7 @@ else
bin="$VALGRIND $EXIV2_BINDIR"
samples="$VALGRIND $EXIV2_BINDIR"
fi
exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 \([^ ]*\).*,\1,p'`"
exiv2version="`$bin/exiv2 -V | sed -n '1 s,^exiv2 [^ ]* \([^ ]*\).*,\1,p'`"
if [ -z "$exiv2version" ]; then
echo "Error: Unable to determine Exiv2 version"
exit 1

Write Preview
Loading…
Cancel
Save