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

The following commit has been merged in the master branch:
commit d6d2e633a8b68edb158e129028fe3715192a5b21
Author: vog <vog at notjusthosting.com>
Date:   Fri Jul 29 12:11:13 2011 +0000

    Improved coding style
---
 src/epsimage.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 8e078fd..d5efa39 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -440,9 +440,9 @@ namespace {
             bool significantLine = true;
             #endif
             // explicit "Begin" comments
-            if (line == "%%BeginDefaults") {
+            if (startsWith(line, "%%BeginPreview:")) {
                 inDefaultsPreviewPrologSetup = true;
-            } else if (startsWith(line, "%%BeginPreview:")) {
+            } else if (line == "%%BeginDefaults") {
                 inDefaultsPreviewPrologSetup = true;
             } else if (line == "%%BeginProlog") {
                 inDefaultsPreviewPrologSetup = true;
@@ -545,10 +545,10 @@ namespace {
                 illustrator8 = true;
             } else if (posEndComments == posEndEps && line == "%%EndComments") {
                 posEndComments = startPos;
-            } else if (line == "%%EndDefaults") {
-                inDefaultsPreviewPrologSetup = false;
             } else if (line == "%%EndPreview") {
                 inDefaultsPreviewPrologSetup = false;
+            } else if (line == "%%EndDefaults") {
+                inDefaultsPreviewPrologSetup = false;
             } else if (line == "%%EndProlog") {
                 inDefaultsPreviewPrologSetup = false;
             } else if (line == "%%EndSetup") {

-- 
exiv2 packaging