Fix regression on issue #157

Redo the fix for issue #157 which is about doing
transparent selection for glyphless documents (eg.
tesseract scanned documents) because it stopped
working after commit 29f32a47

1 files changed, 14 insertions, 12 deletions

diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 6fe1def1..6e6f55d6 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -4805,6 +4805,16 @@ bool TextSelectionPainter::hasGlyphLessFont()
 
 void TextSelectionPainter::endPage()
 {
+    /* Take a shortcut for glyphless fonts (eg. Tesseract scanned documents)
+     * cause we just paint a transparent fill over existent text.Issue #157 */
+    if (hasGlyphLessFont()) {
+        state->setFillOpacity(glyphlessSelectionOpacity);
+        out->updateFillOpacity(state);
+        out->fill(state);
+        out->endPage();
+        return;
+    }
+
     out->fill(state);
 
     out->saveState(state);
@@ -4814,12 +4824,6 @@ void TextSelectionPainter::endPage()
 
     state->setFillColor(glyph_color);
 
-    bool usingGlyphLessFont = hasGlyphLessFont();
-    /* Paint transparent selection when using tesseract glyphless font. Issue #157 */
-    if (usingGlyphLessFont) {
-        state->setFillOpacity(glyphlessSelectionOpacity);
-    }
-
     out->updateFillColor(state);
 
     for (const TextWordSelection *sel : *selectionList) {
@@ -4844,13 +4848,11 @@ void TextSelectionPainter::endPage()
             GooString *string = new GooString((char *)sel->word->charcode, fEnd - begin);
             out->beginString(state, string);
 
-            if (!usingGlyphLessFont) {
-                for (int j = begin; j < fEnd; j++) {
-                    if (j != begin && sel->word->charPos[j] == sel->word->charPos[j - 1]) {
-                        continue;
-                    }
-                    out->drawChar(state, sel->word->textMat[j].m[4], sel->word->textMat[j].m[5], 0, 0, 0, 0, sel->word->charcode[j], 1, nullptr, 0);
+            for (int j = begin; j < fEnd; j++) {
+                if (j != begin && sel->word->charPos[j] == sel->word->charPos[j - 1]) {
+                    continue;
                 }
+                out->drawChar(state, sel->word->textMat[j].m[4], sel->word->textMat[j].m[5], 0, 0, 0, 0, sel->word->charcode[j], 1, nullptr, 0);
             }
             out->endString(state);
             delete string;