1 files changed, 18 insertions, 6 deletions

diff --git a/noncore/unsupported/qpdf/xpdf/GfxFont.h b/noncore/unsupported/qpdf/xpdf/GfxFont.h
index b1aa952..8e9fe38 100644
--- a/noncore/unsupported/qpdf/xpdf/GfxFont.h
+++ b/noncore/unsupported/qpdf/xpdf/GfxFont.h
@@ -1,11 +1,11 @@
 //========================================================================
 //
 // GfxFont.h
 //
-// Copyright 1996-2001 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifndef GFXFONT_H
 #define GFXFONT_H
 
@@ -110,14 +110,13 @@ public:
   // Returns false if there is no embedded font.
   GBool getEmbeddedFontID(Ref *embID)
     { *embID = embFontID; return embFontID.num >= 0; }
 
   // Get the PostScript font name for the embedded font.  Returns
   // NULL if there is no embedded font.
-  char *getEmbeddedFontName()
-    { return embFontName ? embFontName->getCString() : (char *)NULL; }
+  GString *getEmbeddedFontName() { return embFontName; }
 
   // Get the name of the external font file.  Returns NULL if there
   // is no external font file.
   GString *getExtFontFile() { return extFontFile; }
 
   // Get font descriptor flags.
@@ -134,12 +133,15 @@ public:
   fouble *getFontBBox() { return fontBBox; }
 
   // Return the ascent and descent values.
   fouble getAscent() { return ascent; }
   fouble getDescent() { return descent; }
 
+  // Return the writing mode (0=horizontal, 1=vertical).
+  virtual int getWMode() { return 0; }
+
   // Read an external or embedded font file into a buffer.
   char *readExtFontFile(int *len);
   char *readEmbFontFile(XRef *xref, int *len);
 
   // Get the next char from a string <s> of <len> bytes, returning the
   // char <code>, its Unicode mapping <u>, its displacement vector
@@ -152,24 +154,24 @@ public:
                           fouble *dx, fouble *dy, fouble *ox, fouble *oy) = 0;
 
 protected:
 
   void readFontDescriptor(XRef *xref, Dict *fontDict);
   CharCodeToUnicode *readToUnicodeCMap(Dict *fontDict, int nBits);
-  void GfxFont::findExtFontFile();
+  void findExtFontFile();
 
           GString *tag;                 // PDF font tag
           Ref id;               // reference (used as unique ID)
           GString *name;        // font name
           GfxFontType type;     // type of font
           int flags;            // font descriptor flags
           GString *embFontName;         // name of embedded font
           Ref embFontID;        // ref to embedded font file stream
           GString *extFontFile;         // external font file name
           fouble fontMat[6];    // font matrix (Type 3 only)
-          fouble fontBBox[4];   // font bounding box
+          fouble fontBBox[4];   // font bounding box (Type 3 only)
           fouble missingWidth;  // "default" width
           fouble ascent;        // max height above baseline
           fouble descent;       // max depth below baseline
   GBool ok;
 };
 
@@ -201,24 +203,31 @@ public:
   // Returns true if the PDF font specified an encoding.
   GBool getHasEncoding() { return hasEncoding; }
 
   // Get width of a character or string.
   fouble getWidth(Guchar c) { return widths[c]; }
 
+  // Return the Type 3 CharProc dictionary, or NULL if none.
+  Dict *getCharProcs();
+
   // Return the Type 3 CharProc for the character associated with <code>.
   Object *getCharProc(int code, Object *proc);
 
+  // Return the Type 3 Resources dictionary, or NULL if none.
+  Dict *getResources();
+
 private:
 
           char *enc[256];       // char code --> char name
           char encFree[256];    // boolean for each char name: if set,
                                 //   the string is malloc'ed
           CharCodeToUnicode *ctu;// char code --> Unicode
   GBool hasEncoding;
           fouble widths[256];   // character widths
-          Object charProcs;     // Type3 CharProcs dictionary
+          Object charProcs;     // Type 3 CharProcs dictionary
+          Object resources;     // Type 3 Resources dictionary
 };
 
 //------------------------------------------------------------------------
 // GfxCIDFont
 //------------------------------------------------------------------------
 
@@ -233,12 +242,15 @@ public:
   virtual GBool isCIDFont() { return gTrue; }
 
   virtual int getNextChar(char *s, int len, CharCode *code,
                           Unicode *u, int uSize, int *uLen,
                           fouble *dx, fouble *dy, fouble *ox, fouble *oy);
 
+  // Return the writing mode (0=horizontal, 1=vertical).
+  virtual int getWMode();
+
   // Return the Unicode map.
   CharCodeToUnicode *getToUnicode();
 
   // Get the collection name (<registry>-<ordering>).
   GString *getCollection();