From a35ef10f309ffec4f0af05ce84531b462f8ddc60 Mon Sep 17 00:00:00 2001 From: vog Date: Mon, 25 Jul 2011 00:53:32 +0000 Subject: [PATCH] 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 0fb8658e..b8005f66 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") {