[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=a35ef10

The following commit has been merged in the master branch:
commit a35ef10f309ffec4f0af05ce84531b462f8ddc60
Author: vog <vog at notjusthosting.com>
Date:   Mon Jul 25 00:53:32 2011 +0000

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

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 0fb8658..b8005f6 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -427,7 +427,7 @@ namespace {
         bool illustrator8 = false;
         bool implicitPage = false;
         bool implicitPageTrailer = false;
-        bool inDefaultsOrPrologOrSetup = false;
+        bool inPrologOrSetupOrSimilar = false;
         bool inPageSetup = false;
         bool inRemovableEmbedding = false;
         std::string removableEmbeddingEndLine;
@@ -446,7 +446,7 @@ namespace {
                 }
             }
             if (line == "%%EOF" || startsWith(line, "%%IncludeDocument:") || startsWith(line, "%%BeginDocument:") || (line.size() >= 1 && line[0] != '%')) {
-                if (posPage == posEndEps && posEndComments != posEndEps && !inDefaultsOrPrologOrSetup && !inRemovableEmbedding && !onlyWhitespaces(line)) {
+                if (posPage == posEndEps && posEndComments != posEndEps && !inPrologOrSetupOrSimilar && !inRemovableEmbedding && !onlyWhitespaces(line)) {
                     posPage = startPos;
                     implicitPage = true;
                     #ifdef DEBUG
@@ -489,17 +489,17 @@ namespace {
             } else if (posEndComments == posEndEps && line == "%%EndComments") {
                 posEndComments = startPos;
             } else if (line == "%%BeginDefaults") {
-                inDefaultsOrPrologOrSetup = true;
+                inPrologOrSetupOrSimilar = true;
             } else if (line == "%%EndDefaults") {
-                inDefaultsOrPrologOrSetup = false;
+                inPrologOrSetupOrSimilar = false;
             } else if (line == "%%BeginProlog") {
-                inDefaultsOrPrologOrSetup = true;
+                inPrologOrSetupOrSimilar = true;
             } else if (line == "%%EndProlog") {
-                inDefaultsOrPrologOrSetup = false;
+                inPrologOrSetupOrSimilar = false;
             } else if (line == "%%BeginSetup") {
-                inDefaultsOrPrologOrSetup = true;
+                inPrologOrSetupOrSimilar = true;
             } else if (line == "%%EndSetup") {
-                inDefaultsOrPrologOrSetup = false;
+                inPrologOrSetupOrSimilar = false;
             } else if (posPage == posEndEps && startsWith(line, "%%Page:")) {
                 posPage = startPos;
             } else if (line == "%%BeginPageSetup") {

-- 
exiv2 packaging