Attachment 134321 Details for Bug 102760 – proposed patch

[patch] proposed patch

poppler-font2-20170918-193230.pat (text/plain), 2.17 KB, created by William Bader on 2017-09-18 19:57:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2017-09-18 19:57:24 UTC

Size: 2.17 KB

patch

obsolete

> poppler/PSOutputDev.cc | 16 ++++++++++------
> poppler/PSOutputDev.h  |  1 +
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
>diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
>index b2d6d3a..17f31b3 100644
>--- a/poppler/PSOutputDev.cc
>+++ b/poppler/PSOutputDev.cc
>@@ -2544,6 +2544,14 @@ void PSOutputDev::setupExternalTrueTypeFont(GfxFont *font, GooString *fileName,
>   writePS("%%EndResource\n");
> }
> 
>+void PSOutputDev::updateFontMaxValidGlyph(GfxFont *font, int maxValidGlyph) {
>+  if (maxValidGlyph >= 0 && font->getName()) {
>+    if (maxValidGlyph > fontMaxValidGlyph->lookupInt(font->getName())) {
>+      fontMaxValidGlyph->replace(font->getName()->copy(), maxValidGlyph);
>+    }
>+  }
>+}
>+
> void PSOutputDev::setupExternalCIDTrueTypeFont(GfxFont *font,
> 					       GooString *fileName,
> 					       GooString *psName,
>@@ -2594,9 +2602,7 @@ void PSOutputDev::setupExternalCIDTrueTypeFont(GfxFont *font,
> 		needVerticalMetrics,
> 		&maxValidGlyph,
> 		outputFunc, outputStream);
>-	if (maxValidGlyph >= 0 && font->getName()) {
>-	  fontMaxValidGlyph->replace(font->getName()->copy(), maxValidGlyph);
>-	}
>+	updateFontMaxValidGlyph(font, maxValidGlyph);
>       }
>       gfree(codeToGID);
>     } else {
>@@ -2696,9 +2702,7 @@ void PSOutputDev::setupEmbeddedCIDTrueTypeFont(GfxFont *font, Ref *id,
> 			     needVerticalMetrics,
> 			     &maxValidGlyph,
> 			     outputFunc, outputStream);
>-	if (maxValidGlyph > 0 && font->getName()) {
>-	  fontMaxValidGlyph->replace(font->getName()->copy(), maxValidGlyph);
>-	}
>+	updateFontMaxValidGlyph(font, maxValidGlyph);
>       }
>       delete ffTT;
>     }
>diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
>index 833f686..2d92b81 100644
>--- a/poppler/PSOutputDev.h
>+++ b/poppler/PSOutputDev.h
>@@ -355,6 +355,7 @@ private:
>   void setupFonts(Dict *resDict);
>   void setupFont(GfxFont *font, Dict *parentResDict);
>   void setupEmbeddedType1Font(Ref *id, GooString *psName);
>+  void updateFontMaxValidGlyph(GfxFont *font, int maxValidGlyph);
>   void setupExternalType1Font(GooString *fileName, GooString *psName);
>   void setupEmbeddedType1CFont(GfxFont *font, Ref *id, GooString *psName);
>   void setupEmbeddedOpenTypeT1CFont(GfxFont *font, Ref *id, GooString *psName);

Actions: View | Splinter Review

Attachments on bug 102760: 134244 | 134245 | 134321

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.