Attachment 128294 Details for Bug 63963 – Revised patch that does not store maxValidGlyph in GfxFont or FoFiTrueType

[patch] Revised patch that does not store maxValidGlyph in GfxFont or FoFiTrueType

poppler-0.49.0-font-20161201-044759.pat (text/plain), 5.61 KB, created by William Bader on 2016-12-01 04:05:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Bader

Created: 2016-12-01 04:05:17 UTC

Size: 5.61 KB

patch

obsolete

>--- poppler-0.49.0-font/fofi/FoFiTrueType.cc-	2016-09-06 00:02:05.000000000 +0200
>+++ poppler-0.49.0-font/fofi/FoFiTrueType.cc	2016-12-01 04:47:05.639418352 +0100
>@@ -727,12 +727,15 @@
> 
> void FoFiTrueType::convertToType0(char *psName, int *cidMap, int nCIDs,
> 				  GBool needVerticalMetrics,
>+				  int *maxValidGlyph,
> 				  FoFiOutputFunc outputFunc,
> 				  void *outputStream) {
>   GooString *buf;
>   GooString *sfntsName;
>   int maxUsedGlyph, n, i, j;
> 
>+  *maxValidGlyph = -1;
>+
>   if (openTypeCFF) {
>     return;
>   }
>@@ -754,6 +757,13 @@
>   // that refers to one of the unused glyphs -- this results in PS
>   // errors if we simply use maxUsedGlyph+1 for the Type 0 font.  So
>   // we compromise by always defining at least 256 glyphs.)
>+  // Some fonts have a large nGlyphs but maxUsedGlyph of 0.
>+  // These fonts might reference any glyph.
>+  // Return the last written glyph number in maxValidGlyph.
>+  // PSOutputDev::drawString() can use maxValidGlyph to avoid
>+  // referencing zero-length glyphs that we trimmed.
>+  // This allows pdftops to avoid writing huge files while still
>+  // handling the rare PDF that uses a zero-length glyph.
>   if (cidMap) {
>     n = nCIDs;
>   } else if (nGlyphs > maxUsedGlyph + 256) {
>@@ -765,6 +775,7 @@
>   } else {
>     n = nGlyphs;
>   }
>+  *maxValidGlyph = n-1;
>   for (i = 0; i < n; i += 256) {
>     (*outputFunc)(outputStream, "10 dict begin\n", 14);
>     (*outputFunc)(outputStream, "/FontName /", 11);
>--- poppler-0.49.0-font/fofi/FoFiTrueType.h-	2014-10-01 22:14:26.000000000 +0200
>+++ poppler-0.49.0-font/fofi/FoFiTrueType.h	2016-12-01 04:43:53.105947066 +0100
>@@ -144,6 +144,7 @@
>   // <nCIDs> entries.  (Not useful for OpenType CFF fonts.)
>   void convertToType0(char *psName, int *cidMap, int nCIDs,
> 		      GBool needVerticalMetrics,
>+		      int *maxValidGlyph,
> 		      FoFiOutputFunc outputFunc, void *outputStream);
> 
>   // Convert to a Type 0 (but non-CID) composite font, suitable for
>--- poppler-0.49.0-font/poppler/GfxFont.h-	2016-05-02 00:08:03.000000000 +0200
>+++ poppler-0.49.0-font/poppler/GfxFont.h	2016-12-01 04:43:53.106947079 +0100
>@@ -199,7 +199,7 @@
>   // Get font weight.
>   Weight getWeight() { return weight; }
> 
>-  // Get the original font name (ignornig any munging that might have
>+  // Get the original font name (ignoring any munging that might have
>   // been done to map to a canonical Base-14 font name).
>   GooString *getName() { return name; }
> 
>--- poppler-0.49.0-font/poppler/PSOutputDev.cc-	2016-11-15 00:02:03.000000000 +0100
>+++ poppler-0.49.0-font/poppler/PSOutputDev.cc	2016-12-01 04:43:53.109947117 +0100
>@@ -1103,6 +1103,7 @@
> 
>   fontIDs = NULL;
>   fontNames = new GooHash(gTrue);
>+  fontMaxValidGlyph = new GooHash(gTrue);
>   t1FontNames = NULL;
>   font8Info = NULL;
>   font16Enc = NULL;
>@@ -1171,6 +1172,7 @@
> 
>   fontIDs = NULL;
>   fontNames = new GooHash(gTrue);
>+  fontMaxValidGlyph = new GooHash(gTrue);
>   t1FontNames = NULL;
>   font8Info = NULL;
>   font16Enc = NULL;
>@@ -1496,6 +1498,7 @@
>     gfree(fontIDs);
>   }
>   delete fontNames;
>+  delete fontMaxValidGlyph;
>   if (t1FontNames) {
>     for (i = 0; i < t1FontNameLen; ++i) {
>       delete t1FontNames[i].psName;
>@@ -2608,10 +2611,15 @@
> 		outputFunc, outputStream);
>       } else {
> 	// otherwise: use a non-CID composite font
>+	int maxValidGlyph = -1;
> 	ffTT->convertToType0(psName->getCString(),
> 		codeToGID, codeToGIDLen,
> 		needVerticalMetrics,
>+		&maxValidGlyph,
> 		outputFunc, outputStream);
>+	if (maxValidGlyph >= 0 && font->getName()) {
>+	  fontMaxValidGlyph->replace(font->getName()->copy(), maxValidGlyph);
>+	}
>       }
>       gfree(codeToGID);
>     } else {
>@@ -2704,11 +2712,16 @@
> 				outputFunc, outputStream);
>       } else {
> 	// otherwise: use a non-CID composite font
>+	int maxValidGlyph = -1;
> 	ffTT->convertToType0(psName->getCString(),
> 			     ((GfxCIDFont *)font)->getCIDToGID(),
> 			     ((GfxCIDFont *)font)->getCIDToGIDLen(),
> 			     needVerticalMetrics,
>+			     &maxValidGlyph,
> 			     outputFunc, outputStream);
>+	if (maxValidGlyph > 0 && font->getName()) {
>+	  fontMaxValidGlyph->replace(font->getName()->copy(), maxValidGlyph);
>+	}
>       }
>       delete ffTT;
>     }
>@@ -5065,6 +5078,8 @@
>   char buf[8];
>   double *dxdy;
>   int dxdySize, len, nChars, uLen, n, m, i, j;
>+  int maxGlyphInt;
>+  CharCode maxGlyph;
> 
>   // for pdftohtml, output PS without text
>   if( displayText == gFalse )
>@@ -5084,6 +5099,9 @@
>   if (!(font = state->getFont())) {
>     return;
>   }
>+  maxGlyphInt = (font->getName()? fontMaxValidGlyph->lookupInt(font->getName()): 0);
>+  if (maxGlyphInt < 0) maxGlyphInt = 0;
>+  maxGlyph = (CharCode) maxGlyphInt;
>   wMode = font->getWMode();
> 
>   // check for a subtitute 16-bit font
>@@ -5158,6 +5176,14 @@
> 	  dxdy[2 * nChars + 1] = dy;
> 	  ++nChars;
> 	}
>+      } else if (maxGlyph > 0 && code > maxGlyph) {
>+	// Ignore this code.
>+	// Using it will exceed the number of glyphs in the font and generate
>+	// /rangecheck in --xyshow--
>+	if (nChars > 0) {
>+	  dxdy[2 * (nChars-1) ] += dx;
>+	  dxdy[2 * (nChars-1) + 1 ] += dy;
>+	}
>       } else {
> 	if (nChars + 1 > dxdySize) {
> 	  dxdySize *= 2;
>--- poppler-0.49.0-font/poppler/PSOutputDev.h-	2016-05-02 00:08:03.000000000 +0200
>+++ poppler-0.49.0-font/poppler/PSOutputDev.h	2016-12-01 04:43:53.110947130 +0100
>@@ -471,6 +471,7 @@
>   int fontIDSize;		// size of fontIDs array
>   std::set<int> resourceIDs;	// list of object IDs of objects containing Resources we've already set up
>   GooHash *fontNames;		// all used font names
>+  GooHash *fontMaxValidGlyph;	// max valid glyph of each font
>   PST1FontName *t1FontNames;	// font names for Type 1/1C fonts
>   int t1FontNameLen;		// number of entries in t1FontNames array
>   int t1FontNameSize;		// size of t1FontNames array

Actions: View | Splinter Review

Attachments on bug 63963: 78523 | 78524 | 78525 | 124925 | 124926 | 124927 | 126196 | 126197 | 128294

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.