1 files changed, 50 insertions, 23 deletions

diff --git a/noncore/unsupported/qpdf/xpdf/TextOutputDev.cc b/noncore/unsupported/qpdf/xpdf/TextOutputDev.cc
index aa9366a..d3b0137 100644
--- a/noncore/unsupported/qpdf/xpdf/TextOutputDev.cc
+++ b/noncore/unsupported/qpdf/xpdf/TextOutputDev.cc
@@ -4,3 +4,3 @@
 //
-// Copyright 1997 Derek B. Noonburg
+// Copyright 1997-2002 Glyph & Cog, LLC
 //
@@ -50,2 +50,8 @@ TextString::TextString(GfxState *state, fouble fontSize) {
   }
+  if (yMin == yMax) {
+    // this is a sanity check for a case that shouldn't happen -- but
+    // if it does happen, we want to avoid dividing by zero later
+    yMin = y;
+    yMax = y + 1;
+  }
   col = 0;
@@ -101,2 +107,3 @@ void TextPage::updateFont(GfxState *state) {
   int code;
+  fouble w;
 
@@ -118,4 +125,7 @@ void TextPage::updateFont(GfxState *state) {
     if (code < 256) {
-      // 600 is a generic average 'm' width -- yes, this is a hack
-      fontSize *= ((Gfx8BitFont *)font)->getWidth(code) / 0.6;
+      w = ((Gfx8BitFont *)font)->getWidth(code);
+      if (w != 0) {
+        // 600 is a generic average 'm' width -- yes, this is a hack
+        fontSize *= w / 0.6;
+      }
     }
@@ -156,4 +166,6 @@ void TextPage::addChar(GfxState *state, fouble x, fouble y,
   state->transformDelta(dx, dy, &w1, &h1);
-  w1 /= uLen;
-  h1 /= uLen;
+  if (uLen != 0) {
+    w1 /= uLen;
+    h1 /= uLen;
+  }
   for (i = 0; i < uLen; ++i) {
@@ -431,3 +443,3 @@ GString *TextPage::getText(fouble xMin, fouble yMin,
 
-void TextPage::dump(FILE *f) {
+void TextPage::dump(void *outputStream, TextOutputFunc outputFunc) {
   UnicodeMap *uMap;
@@ -500,5 +512,5 @@ void TextPage::dump(FILE *f) {
 #if 0 //~ for debugging
-  fprintf(f, "~~~~~~~~~~\n");
+  fprintf((FILE *)outputStream, "~~~~~~~~~~\n");
   for (str1 = yxStrings; str1; str1 = str1->yxNext) {
-    fprintf(f, "(%4d,%4d) - (%4d,%4d) [%3d] '",
+    fprintf((FILE *)outputStream, "(%4d,%4d) - (%4d,%4d) [%3d] '",
             (int)str1->xMin, (int)str1->yMin,
@@ -510,3 +522,3 @@ void TextPage::dump(FILE *f) {
   }
-  fprintf(f, "~~~~~~~~~~\n");
+  fprintf((FILE *)outputStream, "~~~~~~~~~~\n");
 #endif
@@ -523,3 +535,3 @@ void TextPage::dump(FILE *f) {
       for (; col1 < str1->col; ++col1) {
-        fwrite(space, 1, spaceLen, f);
+        (*outputFunc)(outputStream, space, spaceLen);
       }
@@ -530,3 +542,3 @@ void TextPage::dump(FILE *f) {
       if ((n = uMap->mapUnicode(str1->text[i], buf, sizeof(buf))) > 0) {
-        fwrite(buf, 1, n, f);
+        (*outputFunc)(outputStream, buf, n);
       }
@@ -549,3 +561,3 @@ void TextPage::dump(FILE *f) {
       // print a return
-      fwrite(eol, 1, eolLen, f);
+      (*outputFunc)(outputStream, eol, eolLen);
 
@@ -575,3 +587,3 @@ void TextPage::dump(FILE *f) {
         for (; d > 0; --d) {
-          fwrite(eol, 1, eolLen, f);
+          (*outputFunc)(outputStream, eol, eolLen);
         }
@@ -586,5 +598,5 @@ void TextPage::dump(FILE *f) {
   // end of page
-  fwrite(eol, 1, eolLen, f);
-  fwrite(eop, 1, eopLen, f);
-  fwrite(eol, 1, eolLen, f);
+  (*outputFunc)(outputStream, eol, eolLen);
+  (*outputFunc)(outputStream, eop, eopLen);
+  (*outputFunc)(outputStream, eol, eolLen);
 
@@ -613,2 +625,6 @@ void TextPage::clear() {
 
+static void outputToFile(void *stream, char *text, int len) {
+  fwrite(text, 1, len, (FILE *)stream);
+}
+
 TextOutputDev::TextOutputDev(char *fileName, GBool rawOrderA, GBool append) {
@@ -622,4 +638,4 @@ TextOutputDev::TextOutputDev(char *fileName, GBool rawOrderA, GBool append) {
     if (!strcmp(fileName, "-")) {
-      f = stdout;
-    } else if ((f = fopen(fileName, append ? "a" : "w"))) {
+      outputStream = stdout;
+    } else if ((outputStream = fopen(fileName, append ? "ab" : "wb"))) {
       needClose = gTrue;
@@ -630,4 +646,5 @@ TextOutputDev::TextOutputDev(char *fileName, GBool rawOrderA, GBool append) {
     }
+    outputFunc = &outputToFile;
   } else {
-    f = NULL;
+    outputStream = NULL;
   }
@@ -638,2 +655,12 @@ TextOutputDev::TextOutputDev(char *fileName, GBool rawOrderA, GBool append) {
 
+TextOutputDev::TextOutputDev(TextOutputFunc func, void *stream,
+                             GBool rawOrderA) {
+  outputFunc = func;
+  outputStream = stream;
+  needClose = gFalse;
+  rawOrder = rawOrderA;
+  text = new TextPage(rawOrder);
+  ok = gTrue;
+}
+
 TextOutputDev::~TextOutputDev() {
@@ -641,5 +668,5 @@ TextOutputDev::~TextOutputDev() {
 #ifdef MACOS
-    ICS_MapRefNumAndAssign((short)f->handle);
+    ICS_MapRefNumAndAssign((short)((FILE *)outputStream)->handle);
 #endif
-    fclose(f);
+    fclose((FILE *)outputStream);
   }
@@ -656,4 +683,4 @@ void TextOutputDev::endPage() {
   text->coalesce();
-  if (f) {
-    text->dump(f);
+  if (outputStream) {
+    text->dump(outputStream, outputFunc);
   }