[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=50469e9

The following commit has been merged in the master branch:
commit 50469e9747a76e34aaca22e694484949ba608312
Author: vog <vog at notjusthosting.com>
Date:   Mon Jul 25 01:28:46 2011 +0000

    Improved variable naming in EpsImage
---
 src/epsimage.cpp | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 9da2ba9..8e078fd 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -427,7 +427,7 @@ namespace {
         bool illustrator8 = false;
         bool implicitPage = false;
         bool implicitPageTrailer = false;
-        bool inPrologOrSetupOrSimilar = false;
+        bool inDefaultsPreviewPrologSetup = false;
         bool inPageSetup = false;
         bool inRemovableEmbedding = false;
         std::string removableEmbeddingEndLine;
@@ -440,14 +440,14 @@ namespace {
             bool significantLine = true;
             #endif
             // explicit "Begin" comments
-            if (line == "%%BeginProlog") {
-                inPrologOrSetupOrSimilar = true;
-            } else if (line == "%%BeginSetup") {
-                inPrologOrSetupOrSimilar = true;
-            } else if (line == "%%BeginDefaults") {
-                inPrologOrSetupOrSimilar = true;
+            if (line == "%%BeginDefaults") {
+                inDefaultsPreviewPrologSetup = true;
             } else if (startsWith(line, "%%BeginPreview:")) {
-                inPrologOrSetupOrSimilar = true;
+                inDefaultsPreviewPrologSetup = true;
+            } else if (line == "%%BeginProlog") {
+                inDefaultsPreviewPrologSetup = true;
+            } else if (line == "%%BeginSetup") {
+                inDefaultsPreviewPrologSetup = true;
             } else if (posPage == posEndEps && startsWith(line, "%%Page:")) {
                 posPage = startPos;
             } else if (posPage != posEndEps && startsWith(line, "%%Page:")) {
@@ -503,7 +503,7 @@ namespace {
                     #endif
                 }
             }
-            if (posPage == posEndEps && posEndComments != posEndEps && !inPrologOrSetupOrSimilar && !inRemovableEmbedding && !onlyWhitespaces(line)) {
+            if (posPage == posEndEps && posEndComments != posEndEps && !inDefaultsPreviewPrologSetup && !inRemovableEmbedding && !onlyWhitespaces(line)) {
                 posPage = startPos;
                 implicitPage = true;
                 posEndPageSetup = startPos;
@@ -545,14 +545,14 @@ namespace {
                 illustrator8 = true;
             } else if (posEndComments == posEndEps && line == "%%EndComments") {
                 posEndComments = startPos;
-            } else if (line == "%%EndProlog") {
-                inPrologOrSetupOrSimilar = false;
-            } else if (line == "%%EndSetup") {
-                inPrologOrSetupOrSimilar = false;
             } else if (line == "%%EndDefaults") {
-                inPrologOrSetupOrSimilar = false;
+                inDefaultsPreviewPrologSetup = false;
             } else if (line == "%%EndPreview") {
-                inPrologOrSetupOrSimilar = false;
+                inDefaultsPreviewPrologSetup = false;
+            } else if (line == "%%EndProlog") {
+                inDefaultsPreviewPrologSetup = false;
+            } else if (line == "%%EndSetup") {
+                inDefaultsPreviewPrologSetup = false;
             } else if (posEndPageSetup == posEndEps && line == "%%EndPageSetup") {
                 inPageSetup = false;
                 posEndPageSetup = startPos;

-- 
exiv2 packaging