Changeset 263

Timestamp:

Jan 17, 2009, 11:24:41 AM (12 years ago)

Author:

Eugene Romanenko

Message:

PDF plugin: Poppler library updated to version 0.10.3

Location:

trunk

Files:

• Lucide/SOURCE/plugins/lupoppler/lupoppler.cpp (modified) (1 diff)
• Lucide/changelog (modified) (1 diff)
• poppler/mypoppler/goo/GooString.cc (modified) (2 diffs)
• poppler/mypoppler/goo/GooString.h (modified) (2 diffs)
• poppler/mypoppler/poppler/Annot.cc (modified) (9 diffs)
• poppler/mypoppler/poppler/Annot.h (modified) (2 diffs)
• poppler/mypoppler/poppler/Form.cc (modified) (3 diffs)
• poppler/mypoppler/poppler/Gfx.h (modified) (3 diffs)
• poppler/mypoppler/poppler/Outline.cc (modified) (2 diffs)
• poppler/mypoppler/poppler/PDFDoc.cc (modified) (4 diffs)
• poppler/mypoppler/poppler/PSOutputDev.cc (modified) (24 diffs)
• poppler/mypoppler/poppler/PSOutputDev.h (modified) (2 diffs)
• poppler/mypoppler/poppler/poppler-config.h (modified) (1 diff)

trunk/Lucide/SOURCE/plugins/lupoppler/lupoppler.cpp

@@ -103 +103 @@
 extern "C" char * EXPENTRY getDescription()
 {
-    return "PDF plugin, based on poppler library v0.10.2";
+    return "PDF plugin, based on poppler library v0.10.3";
 }
 

trunk/Lucide/changelog

@@ -1 @@
-1.XX:
-  - PDF plugin: Poppler (pdf rendering) library updated to version 0.10.2.
+1.21:
+  - PDF plugin: Poppler (pdf rendering) library updated to version 0.10.3.
   - PDF plugin: freetype library updated to version 2.3.8.
 

trunk/poppler/mypoppler/goo/GooString.cc

@@ -19 +19 @@
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
 // Copyright (C) 2007 Jeff Muizelaar <jeff@infidigm.net>
+// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
@@ -743 +744 @@
     return (s[0] & 0xff) == 0xfe && (s[1] & 0xff) == 0xff;
 }
+
+GooString *GooString::sanitizedName(GBool psmode)
+{
+  GooString *name;
+  char buf[8];
+  int i;
+  char c;
+
+  name = new GooString();
+
+  if (psmode)
+  {
+    // ghostscript chokes on names that begin with out-of-limits
+    // numbers, e.g., 1e4foo is handled correctly (as a name), but
+    // 1e999foo generates a limitcheck error
+    c = getChar(0);
+    if (c >= '0' && c <= '9') {
+      name->append('f');
+    }
+  }
+
+  for (i = 0; i < getLength(); ++i) {
+    c = getChar(i);
+    if ((psmode && (c <= (char)0x20 || c >= (char)0x7f)) ||
+        c == ' ' ||
+        c == '(' || c == ')' || c == '<' || c == '>' ||
+        c == '[' || c == ']' || c == '{' || c == '}' ||
+        c == '/' || c == '%') {
+      sprintf(buf, "#%02x", c & 0xff);
+      name->append(buf);
+    } else {
+      name->append(c);
+    }
+  }
+  return name;
+}

trunk/poppler/mypoppler/goo/GooString.h

@@ -18 +18 @@
 // Copyright (C) 2006 Kristian HÞgsberg <krh@redhat.com>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
+// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
@@ -138 +139 @@
   GBool hasUnicodeMarker(void);
 
+  // Sanitizes the string so that it does
+  // not contain any ( ) < > [ ] { } / %
+  // The postscript mode also has some more strict checks
+  // The caller owns the return value
+  GooString *sanitizedName(GBool psmode);
+
 private:
   // you can tweak this number for a different speed/memory usage tradeoffs.

trunk/poppler/mypoppler/poppler/Annot.cc

@@ -16 +16 @@
 // Copyright (C) 2006 Scott Turner <scotty1024@mac.com>
 // Copyright (C) 2007, 2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright (C) 2007, 2008 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2007-2009 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007, 2008 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez@gmail.com>
@@ -23 +23 @@
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
+// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
 //
 // To see a description of the changes please see the Changelog file that
@@ -2140 +2141 @@
   int tfPos, tmPos, i, j;
   GBool freeText = gFalse;      // true if text should be freed before return
+  GBool freeFont = gFalse;
 
   //~ if there is no MK entry, this should use the existing content stream,
@@ -2174 +2176 @@
 
   // force ZapfDingbats
-  //~ this should create the font if needed (?)
   if (forceZapfDingbats) {
     if (tfPos >= 0) {
@@ -2191 +2192 @@
     if (tok->getLength() >= 1 && tok->getChar(0) == '/') {
       if (!fontDict || !(font = fontDict->lookup(tok->getCString() + 1))) {
-        error(-1, "Unknown font in field's DA string");
+        if (forceZapfDingbats) {
+          // We are forcing ZaDb but the font does not exist
+          // so create a fake one
+          Ref r; // dummy Ref, it's not used at all in this codepath
+          r.num = 0;
+          r.gen = 0;
+          Dict *d = new Dict(xref);
+          font = new Gfx8BitFont(xref, "ZaDb", r, new GooString("ZapfDingbats"), fontType1, d);
+          delete d;
+          freeFont = gTrue;
+          addDingbatsResource = gTrue;
+        } else {
+          error(-1, "Unknown font in field's DA string");
+        }
       }
     } else {
@@ -2496 +2510 @@
   }
   delete convertedText;
+  if (freeFont) {
+    font->decRefCnt();
+  }
 }
 
@@ -3057 +3074 @@
     }
 
+    obj2.free();
+    obj1.free();
+
     // this annot doesn't have an AP yet, create one
     if (appRef.num == 0)
@@ -3099 +3119 @@
   }
 
+  addDingbatsResource = gFalse;
   generateFieldAppearance ();
 
   // draw the appearance stream
   appearance.fetch(xref, &obj);
+  if (addDingbatsResource) {
+    // We are forcing ZaDb but the font does not exist
+    // so create a fake one
+    Object baseFontObj, subtypeObj;
+    baseFontObj.initName("ZapfDingbats");
+    subtypeObj.initName("Type1");
+
+    Object fontDictObj;
+    Dict *fontDict = new Dict(xref);
+    fontDict->decRef();
+    fontDict->add(copyString("BaseFont"), &baseFontObj);
+    fontDict->add(copyString("Subtype"), &subtypeObj);
+    fontDictObj.initDict(fontDict);
+
+    Object fontsDictObj;
+    Dict *fontsDict = new Dict(xref);
+    fontsDict->decRef();
+    fontsDict->add(copyString("ZaDb"), &fontDictObj);
+    fontsDictObj.initDict(fontsDict);
+
+    Dict *dict = new Dict(xref);
+    dict->add(copyString("Font"), &fontsDictObj);
+    gfx->pushResources(dict);
+    delete dict;
+  }
   gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
                  rect->x1, rect->y1, rect->x2, rect->y2);
+  if (addDingbatsResource) {
+    gfx->popResources();
+  }
   obj.free();
 }
@@ -3389 +3438 @@
   if (appearCharacs)
     delete appearCharacs;
+
+  action.free();
+  additionAction.free();
 }
 

trunk/poppler/mypoppler/poppler/Annot.h

@@ -22 +22 @@
 // Copyright (C) 2008 Pino Toscano <pino@kde.org>
 // Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
+// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
@@ -1195 +1196 @@
   Dict *parent;                           // Parent
   GBool regen;
+  GBool addDingbatsResource;
 };
 

trunk/poppler/mypoppler/poppler/Form.cc

@@ -6 +6 @@
 //
 // Copyright 2006-2008 Julien Rebetez <julienr@svn.gnome.org>
-// Copyright 2007-2008 Albert Astals Cid <aacid@kde.org>
+// Copyright 2007-2009 Albert Astals Cid <aacid@kde.org>
 // Copyright 2007-2008 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright 2007 Adrian Johnson <ajohnson@redneon.com>
@@ -259 +259 @@
           }
         } else if (obj2.isStream()) {
+          // TODO do something with str and obj3
           Stream *str = obj2.getStream();
           Dict *tmpDict2 = str->getDict();
@@ -264 +265 @@
           tmpDict2->lookup("Length", &obj3);
           onStr = new GooString ("D");
+          obj3.free();
         }
         obj2.free();

trunk/poppler/mypoppler/poppler/Gfx.h

@@ -18 +18 @@
 // Copyright (C) 2008 Brad Hards <bradh@kde.org>
 // Copyright (C) 2008 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2009 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
@@ -163 +164 @@
   // Get the current graphics state object.
   GfxState *getState() { return state; }
+
+  void pushResources(Dict *resDict);
+  void popResources();
 
 private:
@@ -334 +338 @@
   void pushMarkedContent();
   void popMarkedContent();
-
-  void pushResources(Dict *resDict);
-  void popResources();
 };
 

trunk/poppler/mypoppler/poppler/Outline.cc

@@ -15 +15 @@
 //
 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
+// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
 //
 // To see a description of the changes please see the Changelog file that
@@ -133 +134 @@
   Object *p;
 
+  if (!lastItemRef->isRef())
+    return NULL;
+
   items = new GooList();
   p = firstItemRef;

trunk/poppler/mypoppler/poppler/PDFDoc.cc

@@ -636 +636 @@
   outStr->printf("<<");
   for (int i=0; i<dict->getLength(); i++) {
-    outStr->printf("/%s ", dict->getKey(i));
+    GooString keyName(dict->getKey(i));
+    GooString *keyNameToPrint = keyName.sanitizedName(gFalse /* non ps mode */);
+    outStr->printf("/%s ", keyNameToPrint->getCString());
+    delete keyNameToPrint;
     writeObject(dict->getValNF(i, &obj1), NULL, outStr);
     obj1.free();
   }
-  outStr->printf(">>");
+  outStr->printf(">> ");
 }
 
@@ -712 +715 @@
 
   if(ref) 
-    outStr->printf("%i %i obj", ref->num, ref->gen);
+    outStr->printf("%i %i obj ", ref->num, ref->gen);
 
   switch (obj->getType()) {
@@ -728 +731 @@
       break;
     case objName:
-      outStr->printf("/%s ", obj->getName());
-      break;
+    {
+      GooString name(obj->getName());
+      GooString *nameToPrint = name.sanitizedName(gFalse /* non ps mode */);
+      outStr->printf("/%s ", nameToPrint->getCString());
+      delete nameToPrint;
+      break;
+    }
     case objNull:
       outStr->printf( "null");
@@ -740 +748 @@
         obj1.free();
       }
-      outStr->printf("]");
+      outStr->printf("] ");
       break;
     case objDict:

trunk/poppler/mypoppler/poppler/PSOutputDev.cc

@@ -19 +19 @@
 // Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2007, 2008 Brad Hards <bradh@kde.org>
+// Copyright (C) 2008 Koji Otani <sho@bbr.jp>
 //
 // To see a description of the changes please see the Changelog file that
@@ -36 +37 @@
 #include <signal.h>
 #include <math.h>
+#include <limits.h>
 #include "goo/GooString.h"
 #include "goo/GooList.h"
@@ -1647 +1649 @@
              font->getType() == fontType1 &&
              font->getEmbeddedFontID(&fontFileID)) {
-    psName = filterPSName(font->getEmbeddedFontName());
+    psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
     setupEmbeddedType1Font(&fontFileID, psName);
 
@@ -1656 +1658 @@
     // use the PDF font name because the embedded font name might
     // not include the subset prefix
-    psName = filterPSName(font->getOrigName());
+    psName = font->getOrigName()->sanitizedName(gTrue /* ps mode */);
     setupEmbeddedType1CFont(font, &fontFileID, psName);
 
@@ -1665 +1667 @@
     // use the PDF font name because the embedded font name might
     // not include the subset prefix
-    psName = filterPSName(font->getOrigName());
+    psName = font->getOrigName()->sanitizedName(gTrue /* ps mode */);
     setupEmbeddedOpenTypeT1CFont(font, &fontFileID, psName);
 
@@ -1681 +1683 @@
               font->getType() == fontTrueTypeOT) &&
              font->getEmbeddedFontID(&fontFileID)) {
-    psName = filterPSName(font->getEmbeddedFontName());
+    psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
     setupEmbeddedTrueTypeFont(font, &fontFileID, psName);
 
@@ -1694 +1696 @@
              font->getType() == fontCIDType0C &&
              font->getEmbeddedFontID(&fontFileID)) {
-    psName = filterPSName(font->getEmbeddedFontName());
+    psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
     setupEmbeddedCIDType0Font(font, &fontFileID, psName);
 
@@ -1702 +1704 @@
               font->getType() == fontCIDType2OT) &&
              font->getEmbeddedFontID(&fontFileID)) {
-    psName = filterPSName(font->getEmbeddedFontName());
+    psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
     setupEmbeddedCIDTrueTypeFont(font, &fontFileID, psName, gTrue);
 
@@ -1709 +1711 @@
              font->getType() == fontCIDType0COT &&
              font->getEmbeddedFontID(&fontFileID)) {
-    psName = filterPSName(font->getEmbeddedFontName());
+    psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
     setupEmbeddedOpenTypeCFFFont(font, &fontFileID, psName);
 
@@ -1878 +1880 @@
   int start[4];
   GBool binMode;
+  GBool writePadding = gTrue;
   int i;
 
@@ -1949 +1952 @@
   }
 
+  if (length2 == 0)
+  {
+    // length2 == 0 is an error
+    // trying to solve it by just piping all
+    // the stream data
+    error(-1, "Font has length2 as 0, trying to overcome the problem reading the stream until the end");
+    length2 = INT_MAX;
+    writePadding = gFalse;
+  }
+
+
   // convert binary data to ASCII
   if (binMode) {
@@ -1987 +2001 @@
   }
 
-  // write padding and "cleartomark"
-  for (i = 0; i < 8; ++i) {
-    writePS("00000000000000000000000000000000"
-            "00000000000000000000000000000000\n");
-  }
-  writePS("cleartomark\n");
+  if (writePadding)
+  {
+    // write padding and "cleartomark"
+    for (i = 0; i < 8; ++i) {
+      writePS("00000000000000000000000000000000"
+              "00000000000000000000000000000000\n");
+    }
+    writePS("cleartomark\n");
+  }
 
   // ending comment
@@ -2207 +2224 @@
   }
 
-  psName = filterPSName(font->getName());
+  psName = font->getName()->sanitizedName(gTrue /* ps mode */);
   // add entry to fontFileNames list
   if (i == fontFileNameLen) {
@@ -2280 +2297 @@
   }
 
-  psName = filterPSName(font->getName());
+  psName = font->getName()->sanitizedName(gTrue /* ps mode */);
   // add entry to fontFileNames list
   if (i == fontFileNameLen) {
@@ -2611 +2628 @@
   int c;
   int size, line, col, i;
+  int outerSize, outer;
 
   // check if image is already setup
@@ -2697 +2715 @@
     ++size;
   }
+  outerSize = size/65535 + 1;
+
   writePSFmt("{0:d} array dup /ImData_{1:d}_{2:d} exch def\n",
-             size, id.num, id.gen);
+             outerSize, id.num, id.gen);
   str->close();
 
   // write the data into the array
   str->reset();
-  line = col = 0;
-  writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~"));
-  do {
-    do {
-      c = str->getChar();
-    } while (c == '\n' || c == '\r');
-    if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
-      break;
-    }
-    if (c == 'z') {
-      writePSChar(c);
-      ++col;
-    } else {
-      writePSChar(c);
-      ++col;
-      for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
-        do {
-          c = str->getChar();
-        } while (c == '\n' || c == '\r');
-        if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
-          break;
-        }
+  for (outer = 0;outer < outerSize;outer++) {
+    int innerSize = size > 65535 ? 65535 : size;
+
+    // put the inner array into the outer array
+    writePSFmt("{0:d} array 1 index {1:d} 2 index put\n",
+               innerSize, outer);
+    line = col = 0;
+    writePS((char *)(useASCIIHex ? "dup 0 <" : "dup 0 <~"));
+    for (;;) {
+      do {
+        c = str->getChar();
+      } while (c == '\n' || c == '\r');
+      if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+        break;
+      }
+      if (c == 'z') {
         writePSChar(c);
         ++col;
-      }
-    }
-    // each line is: "dup nnnnn <~...data...~> put<eol>"
-    // so max data length = 255 - 20 = 235
-    // chunks are 1 or 4 bytes each, so we have to stop at 232
-    // but make it 225 just to be safe
-    if (col > 225) {
+      } else {
+        writePSChar(c);
+        ++col;
+        for (i = 1; i <= (useASCIIHex ? 1 : 4); ++i) {
+          do {
+            c = str->getChar();
+          } while (c == '\n' || c == '\r');
+          if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
+            break;
+          }
+          writePSChar(c);
+          ++col;
+        }
+      }
+      // each line is: "dup nnnnn <~...data...~> put<eol>"
+      // so max data length = 255 - 20 = 235
+      // chunks are 1 or 4 bytes each, so we have to stop at 232
+      // but make it 225 just to be safe
+      if (col > 225) {
+        writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
+        ++line;
+        if (line >= innerSize) break;
+        writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
+        col = 0;
+      }
+    }
+    if (c == (useASCIIHex ? '>' : '~') || c == EOF) {
       writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
-      ++line;
-      writePSFmt((char *)(useASCIIHex ? "dup {0:d} <" : "dup {0:d} <~"), line);
-      col = 0;
-    }
-  } while (c != (useASCIIHex ? '>' : '~') && c != EOF);
-  writePS((char *)(useASCIIHex ? "> put\n" : "~> put\n"));
-  if (useRLE) {
-    ++line;
-    writePSFmt("{0:d} <> put\n", line);
-  } else {
+      if (useRLE) {
+        ++line;
+        writePSFmt("{0:d} <> put\n", line);
+      } else {
+        writePS("pop\n");
+      }
+      break;
+    }
     writePS("pop\n");
-  }
+    size -= innerSize;
+  }
+  writePS("pop\n");
   str->close();
 
@@ -4383 +4417 @@
       setupImage(ref->getRef(), str);
       // set up to use the array already created by setupImages()
-      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
+      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
     }
   }
@@ -4846 +4880 @@
       setupImage(ref->getRef(), str);
       // set up to use the array already created by setupImages()
-      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
+      writePSFmt("ImData_{0:d}_{1:d} 0 0\n",ref->getRefNum(), ref->getRefGen());
     }
   }
@@ -4900 +4934 @@
   // data source
   if (mode == psModeForm || inType3Char || preload) {
-    writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    if (inlineImg) {
+      writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    } else {
+      writePS("  /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2"
+        " index get 1 index get exch 1 add exch }\n");
+    }
   } else {
     writePS("  /DataSource currentfile\n");
@@ -4939 +4978 @@
 
     // get rid of the array and index
+    if (!inlineImg) writePS("pop ");
     writePS("pop pop\n");
 
@@ -5116 +5156 @@
       setupImage(ref->getRef(), str);
       // set up to use the array already created by setupImages()
-      writePSFmt("ImData_{0:d}_{1:d} 0\n", ref->getRefNum(), ref->getRefGen());
+      writePSFmt("ImData_{0:d}_{1:d} 0 0\n", ref->getRefNum(), ref->getRefGen());
     }
   }
@@ -5187 +5227 @@
   // data source
   if (mode == psModeForm || inType3Char || preload) {
-    writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    if (inlineImg) {
+        writePS("  /DataSource { 2 copy get exch 1 add exch }\n");
+    } else {
+        writePS("  /DataSource { dup 65535 ge { pop 1 add 0 } if 2 index 2"
+          " index get 1 index get exch 1 add exch }\n");
+    }
   } else {
     writePS("  /DataSource currentfile\n");
@@ -5323 +5368 @@
   // get rid of the array and index
   if (mode == psModeForm || inType3Char || preload) {
+    if (!inlineImg) writePS("pop ");
     writePS("pop pop\n");
 
@@ -6295 +6341 @@
 }
 
-GooString *PSOutputDev::filterPSName(GooString *name) {
-  GooString *name2;
-  char buf[8];
-  int i;
-  char c;
-
-  name2 = new GooString();
-
-  // ghostscript chokes on names that begin with out-of-limits
-  // numbers, e.g., 1e4foo is handled correctly (as a name), but
-  // 1e999foo generates a limitcheck error
-  c = name->getChar(0);
-  if (c >= '0' && c <= '9') {
-    name2->append('f');
-  }
-
-  for (i = 0; i < name->getLength(); ++i) {
-    c = name->getChar(i);
-    if (c <= (char)0x20 || c >= (char)0x7f ||
-        c == '(' || c == ')' || c == '<' || c == '>' ||
-        c == '[' || c == ']' || c == '{' || c == '}' ||
-        c == '/' || c == '%') {
-      sprintf(buf, "#%02x", c & 0xff);
-      name2->append(buf);
-    } else {
-      name2->append(c);
-    }
-  }
-  return name2;
-}
-
 // Convert GooString to GooString, with appropriate escaping
 // of things that can't appear in a label

trunk/poppler/mypoppler/poppler/PSOutputDev.h

@@ -16 +16 @@
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
 // Copyright (C) 2005 Kristian HÞgsberg <krh@redhat.com>
-// Copyright (C) 2006, 2007 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2008 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2007 Brad Hards <bradh@kde.org>
 //
@@ -327 +327 @@
   void writePSString(GooString *s);
   void writePSName(char *s);
-  GooString *filterPSName(GooString *name);
   GooString *filterPSLabel(GooString *label, GBool *needParens=0);
   void writePSTextLine(GooString *s);

trunk/poppler/mypoppler/poppler/poppler-config.h

@@ -49 +49 @@
 
 // copyright notice
-#define popplerCopyright "Copyright 2005-2008 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"
 #define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"