Port to xpdf 1.01

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
@@ -4,3 +4,3 @@
 //
-// Copyright 1996-2001 Derek B. Noonburg
+// Copyright 1996-2002 Glyph & Cog, LLC
 //
@@ -115,4 +115,3 @@ public:
   // NULL if there is no embedded font.
-  char *getEmbeddedFontName()
-    { return embFontName ? embFontName->getCString() : (char *)NULL; }
+  GString *getEmbeddedFontName() { return embFontName; }
 
@@ -139,2 +138,5 @@ public:
 
+  // Return the writing mode (0=horizontal, 1=vertical).
+  virtual int getWMode() { return 0; }
+
   // Read an external or embedded font file into a buffer.
@@ -157,3 +159,3 @@ protected:
   CharCodeToUnicode *readToUnicodeCMap(Dict *fontDict, int nBits);
-  void GfxFont::findExtFontFile();
+  void findExtFontFile();
 
@@ -168,3 +170,3 @@ protected:
   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
@@ -206,2 +208,5 @@ public:
 
+  // Return the Type 3 CharProc dictionary, or NULL if none.
+  Dict *getCharProcs();
+
   // Return the Type 3 CharProc for the character associated with <code>.
@@ -209,2 +214,5 @@ public:
 
+  // Return the Type 3 Resources dictionary, or NULL if none.
+  Dict *getResources();
+
 private:
@@ -217,3 +225,4 @@ private:
   fouble widths[256];		// character widths
-  Object charProcs;		// Type3 CharProcs dictionary
+  Object charProcs;		// Type 3 CharProcs dictionary
+  Object resources;		// Type 3 Resources dictionary
 };
@@ -238,2 +247,5 @@ public:
 
+  // Return the writing mode (0=horizontal, 1=vertical).
+  virtual int getWMode();
+
   // Return the Unicode map.