[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:33 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=8c6d9fe
The following commit has been merged in the master branch:
commit 8c6d9fe2c2440bb6bb1eaedfa26a99735bb707f7
Author: vog <vog at notjusthosting.com>
Date: Tue Jul 12 17:19:43 2011 +0000
fixed EpsImage to handle %%PageTrailer and %%Trailer properly, adjusted test suite
---
src/epsimage.cpp | 19 +++++++++++--------
...t_minimal-eof.eps => eps-flat_minimal-trailer.eps} | 2 +-
...eps.newxmp => eps-flat_minimal-trailer.eps.newxmp} | 1 +
...pty-eof-noeol.xmp => eps-flat_minimal-trailer.xmp} | 0
test/data/eps/eps-flat_oodraw-lev1.eps.newxmp | 1 +
test/data/eps/eps-flat_oodraw-lev2.eps.newxmp | 1 +
test/data/eps/eps-flat_oodraw-lev2_eps2eps.eps.newxmp | 1 +
test/data/eps/eps-flat_oodraw_ai-3-lev2.eps.newxmp | 2 +-
test/data/eps/eps-flat_oodraw_ai-3-lev3.eps.newxmp | 2 +-
test/data/eps/eps-flat_oodraw_ai-8-lev3.eps.newxmp | 2 +-
test/data/eps/eps-test.out | 17 +++++++++++++++++
11 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 1fd5557..2e6ba77 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -431,6 +431,7 @@ namespace {
size_t posEof = posEndEps;
std::vector<std::pair<size_t, size_t> > removableEmbeddings;
bool implicitPage = false;
+ bool implicitPageTrailer = false;
bool photoshop = false;
bool inDefaultsOrPrologOrSetup = false;
bool inPageSetup = false;
@@ -465,11 +466,14 @@ namespace {
}
}
if (line.size() >= 1 && line[0] != '%') continue; // performance optimization
- if (line == "%%EOF" && posPageTrailer == posEndEps) {
- posPageTrailer = startPos;
- #ifdef DEBUG
- EXV_DEBUG << "readWriteEpsMetadata: Found implicit PageTrailer at position: " << startPos << "
";
- #endif
+ if (line == "%%EOF" || line == "%%Trailer") {
+ if (posPageTrailer == posEndEps) {
+ posPageTrailer = startPos;
+ implicitPageTrailer = true;
+ #ifdef DEBUG
+ EXV_DEBUG << "readWriteEpsMetadata: Found implicit PageTrailer at position: " << startPos << "
";
+ #endif
+ }
}
// explicit comments
#ifdef DEBUG
@@ -893,11 +897,10 @@ namespace {
}
}
if (pos == posPageTrailer) {
- if (pos == posEndEps || pos == posEof) {
- writeTemp(*tempIo, "%%PageTrailer" + lineEnding);
- } else {
+ if (!implicitPageTrailer) {
skipPos = posLineEnd;
}
+ writeTemp(*tempIo, "%%PageTrailer" + lineEnding);
writeTemp(*tempIo, "%Exiv2BeginXMP: After %%PageTrailer" + lineEnding);
writeTemp(*tempIo, "[/EMC Exiv2_pdfmark" + lineEnding);
writeTemp(*tempIo, "[/NamespacePop Exiv2_pdfmark" + lineEnding);
diff --git a/test/data/eps/eps-flat_minimal-eof.eps b/test/data/eps/eps-flat_minimal-trailer.eps
similarity index 93%
copy from test/data/eps/eps-flat_minimal-eof.eps
copy to test/data/eps/eps-flat_minimal-trailer.eps
index 86375c6..8f0cbf9 100644
--- a/test/data/eps/eps-flat_minimal-eof.eps
+++ b/test/data/eps/eps-flat_minimal-trailer.eps
@@ -4,4 +4,4 @@
10 10 moveto
0 90 rlineto 90 0 rlineto 0 -90 rlineto closepath
stroke
-%%EOF
+%%Trailer
diff --git a/test/data/eps/eps-flat_minimal-eof.eps.newxmp b/test/data/eps/eps-flat_minimal-trailer.eps.newxmp
similarity index 99%
copy from test/data/eps/eps-flat_minimal-eof.eps.newxmp
copy to test/data/eps/eps-flat_minimal-trailer.eps.newxmp
index f9f1be0..7cadca3 100644
--- a/test/data/eps/eps-flat_minimal-eof.eps.newxmp
+++ b/test/data/eps/eps-flat_minimal-trailer.eps.newxmp
@@ -67,4 +67,5 @@ stroke
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
%Exiv2EndXMP
+%%Trailer
%%EOF
diff --git a/test/data/eps/eps-flat_empty-eof-noeol.xmp b/test/data/eps/eps-flat_minimal-trailer.xmp
similarity index 100%
copy from test/data/eps/eps-flat_empty-eof-noeol.xmp
copy to test/data/eps/eps-flat_minimal-trailer.xmp
diff --git a/test/data/eps/eps-flat_oodraw-lev1.eps.newxmp b/test/data/eps/eps-flat_oodraw-lev1.eps.newxmp
index 98b6df3..62ca1e4 100644
--- a/test/data/eps/eps-flat_oodraw-lev1.eps.newxmp
+++ b/test/data/eps/eps-flat_oodraw-lev1.eps.newxmp
@@ -123,6 +123,7 @@ gr
0 27700 t
pom
count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore
+%%PageTrailer
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
diff --git a/test/data/eps/eps-flat_oodraw-lev2.eps.newxmp b/test/data/eps/eps-flat_oodraw-lev2.eps.newxmp
index aab5f13..82474e8 100644
--- a/test/data/eps/eps-flat_oodraw-lev2.eps.newxmp
+++ b/test/data/eps/eps-flat_oodraw-lev2.eps.newxmp
@@ -124,6 +124,7 @@ gr
0 27700 t
pom
count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore
+%%PageTrailer
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
diff --git a/test/data/eps/eps-flat_oodraw-lev2_eps2eps.eps.newxmp b/test/data/eps/eps-flat_oodraw-lev2_eps2eps.eps.newxmp
index 15072bd..31a6106 100644
--- a/test/data/eps/eps-flat_oodraw-lev2_eps2eps.eps.newxmp
+++ b/test/data/eps/eps-flat_oodraw-lev2_eps2eps.eps.newxmp
@@ -127,6 +127,7 @@ S
Q
cleartomark end end pagesave restore
showpage
+%%PageTrailer
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
diff --git a/test/data/eps/eps-flat_oodraw_ai-3-lev2.eps.newxmp b/test/data/eps/eps-flat_oodraw_ai-3-lev2.eps.newxmp
index cfbc0b5..2c9d30d 100644
--- a/test/data/eps/eps-flat_oodraw_ai-3-lev2.eps.newxmp
+++ b/test/data/eps/eps-flat_oodraw_ai-3-lev2.eps.newxmp
@@ -800,7 +800,7 @@ Adobe_IllustratorA_AI3 /initialize get exec
-<?xpacket end="w"?>
% &&end XMP packet marker&&
[/Document 1 dict begin
/Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
%Exiv2EndXMP
%%EndPageSetup
0 A
u
0 O
0.5 g
0 J 0 j 1 w 10 M []0 d
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
f
0 R
0 G
1 j 0 w
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
s
U
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
%Exiv2EndXMP
gsave annotatepage grestore showpage
%%Trailer
Adobe_IllustratorA_AI3 /terminate get exec
+<?xpacket end="w"?>
% &&end XMP packet marker&&
[/Document 1 dict begin
/Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
%Exiv2EndXMP
%%EndPageSetup
0 A
u
0 O
0.5 g
0 J 0 j 1 w 10 M []0 d
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
f
0 R
0 G
1 j 0 w
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
s
U
%%PageTrailer
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
%Exiv2EndXMP
gsave annotatepage grestore showpage
%%Trailer
Adobe_IllustratorA_AI3 /terminate get exec
Adobe_customcolor /terminate get exec
Adobe_cshow /terminate get exec
Adobe_packedarray /terminate get exec
diff --git a/test/data/eps/eps-flat_oodraw_ai-3-lev3.eps.newxmp b/test/data/eps/eps-flat_oodraw_ai-3-lev3.eps.newxmp
index 4cd2b0b..4491f84 100644
--- a/test/data/eps/eps-flat_oodraw_ai-3-lev3.eps.newxmp
+++ b/test/data/eps/eps-flat_oodraw_ai-3-lev3.eps.newxmp
@@ -800,7 +800,7 @@ Adobe_IllustratorA_AI3 /initialize get exec
-<?xpacket end="w"?>
% &&end XMP packet marker&&
[/Document 1 dict begin
/Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
%Exiv2EndXMP
%%EndPageSetup
0 A
u
0 O
0.5 g
0 J 0 j 1 w 10 M []0 d
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
f
0 R
0 G
1 j 0 w
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
s
U
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
%Exiv2EndXMP
gsave annotatepage grestore showpage
%%Trailer
Adobe_IllustratorA_AI3 /terminate get exec
+<?xpacket end="w"?>
% &&end XMP packet marker&&
[/Document 1 dict begin
/Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
%Exiv2EndXMP
%%EndPageSetup
0 A
u
0 O
0.5 g
0 J 0 j 1 w 10 M []0 d
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
f
0 R
0 G
1 j 0 w
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
s
U
%%PageTrailer
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
%Exiv2EndXMP
gsave annotatepage grestore showpage
%%Trailer
Adobe_IllustratorA_AI3 /terminate get exec
Adobe_customcolor /terminate get exec
Adobe_cshow /terminate get exec
Adobe_packedarray /terminate get exec
diff --git a/test/data/eps/eps-flat_oodraw_ai-8-lev3.eps.newxmp b/test/data/eps/eps-flat_oodraw_ai-8-lev3.eps.newxmp
index 84b849b..e3f2e58 100644
--- a/test/data/eps/eps-flat_oodraw_ai-8-lev3.eps.newxmp
+++ b/test/data/eps/eps-flat_oodraw_ai-8-lev3.eps.newxmp
@@ -2748,7 +2748,7 @@ Adobe_Illustrator_AI5 /initialize get exec
-<?xpacket end="w"?>
% &&end XMP packet marker&&
[/Document 1 dict begin
/Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
%Exiv2EndXMP
%%EndPageSetup
1 1 1 1 0 0 1 0 79 128 255 0 50 Lb
(Layer 1) Ln
0 A
u
0 O
0.5 g
0 J 0 j 1 w 10 M []0 d
1 XR
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
f
0 R
0 G
1 j 0 w
0 XR
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
s
U
/BBAccumRotation (0.000000) XT
LB
%AI5_EndLayer--
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
%Exiv2EndXMP
gsave annotatepage grestore showpage
%%Trailer
Adobe_Illustrator_AI5 /terminate get exec
+<?xpacket end="w"?>
% &&end XMP packet marker&&
[/Document 1 dict begin
/Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark
%Exiv2EndXMP
%%EndPageSetup
1 1 1 1 0 0 1 0 79 128 255 0 50 Lb
(Layer 1) Ln
0 A
u
0 O
0.5 g
0 J 0 j 1 w 10 M []0 d
1 XR
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
f
0 R
0 G
1 j 0 w
0 XR
305.3501 311.0195 m
199 311.0195 l
199 481 l
411.6992 481 l
411.6992 311.0195 l
305.3501 311.0195 l
305.3501 311.0195 l
s
U
/BBAccumRotation (0.000000) XT
LB
%AI5_EndLayer--
%%PageTrailer
%Exiv2BeginXMP: After %%PageTrailer
[/EMC Exiv2_pdfmark
[/NamespacePop Exiv2_pdfmark
%Exiv2EndXMP
gsave annotatepage grestore showpage
%%Trailer
Adobe_Illustrator_AI5 /terminate get exec
Adobe_shading_AI8 /terminate get exec
Adobe_ColorImage_AI6 /terminate get exec
Adobe_cshow /terminate get exec
diff --git a/test/data/eps/eps-test.out b/test/data/eps/eps-test.out
index f937c94..3415d2a 100644
--- a/test/data/eps/eps-test.out
+++ b/test/data/eps/eps-test.out
@@ -151,6 +151,23 @@ Exit code: 0
Command: exiv2 -f -ex eps-flat_minimal-noeol.eps
Exit code: 0
+-----> eps-flat_minimal-trailer.eps <-----
+
+Command: exiv2 -u -pa eps-flat_minimal-trailer.eps
+Exit code: 253
+
+Command: exiv2 -f -eX eps-flat_minimal-trailer.eps
+Exit code: 0
+
+Command: exiv2 -ix eps-flat_minimal-trailer.eps
+Exit code: 0
+
+Command: (2) exiv2 -ix eps-flat_minimal-trailer.eps
+Exit code: 0
+
+Command: exiv2 -f -ex eps-flat_minimal-trailer.eps
+Exit code: 0
+
-----> eps-flat_minimal.eps <-----
Command: exiv2 -u -pa eps-flat_minimal.eps
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list