Synched with Xpdf 1.01

1 files changed, 13 insertions, 8 deletions

diff --git a/pdf/xpdf/T1Font.h b/pdf/xpdf/T1Font.h
index 6c1e8f8..5215c3a 100644
--- a/pdf/xpdf/T1Font.h
+++ b/pdf/xpdf/T1Font.h
@@ -4,6 +4,8 @@
 //
 // An X wrapper for the t1lib Type 1 font rasterizer.
 //
+// Copyright 2001-2002 Glyph & Cog, LLC
+//
 //========================================================================
 
 #ifndef T1FONT_H
@@ -19,15 +21,15 @@
 #include <t1lib.h>
 #include "SFont.h"
 
-class FontEncoding;
+class GfxState;
 
 //------------------------------------------------------------------------
 
 class T1FontEngine: public SFontEngine {
 public:
 
-  T1FontEngine(Display *display, Visual *visual, int depth,
-	       Colormap colormap, GBool aa, GBool aaHigh);
+  T1FontEngine(Display *displayA, Visual *visualA, int depthA,
+	       Colormap colormapA, GBool aaA, GBool aaHighA);
   GBool isOk() { return ok; }
   virtual ~T1FontEngine();
 
@@ -46,8 +48,8 @@ private:
 class T1FontFile: public SFontFile {
 public:
 
-  T1FontFile(T1FontEngine *engine, char *fontFileName,
-	     FontEncoding *fontEnc);
+  T1FontFile(T1FontEngine *engineA, char *fontFileName,
+	     char **fontEnc, double *bboxA);
   GBool isOk() { return ok; }
   virtual ~T1FontFile();
 
@@ -57,6 +59,7 @@ private:
   int id;			// t1lib font ID
   char **enc;
   char *encStr;
+  double bbox[4];
   GBool ok;
 
   friend class T1Font;
@@ -73,15 +76,17 @@ struct T1FontCacheTag {
 class T1Font: public SFont {
 public:
 
-  T1Font(T1FontFile *fontFile, double *m);
+  T1Font(T1FontFile *fontFileA, double *m);
   GBool isOk() { return ok; }
   virtual ~T1Font();
   virtual GBool drawChar(Drawable d, int w, int h, GC gc,
-			 int x, int y, int r, int g, int b, Gushort c);
+			 int x, int y, int r, int g, int b,
+			 CharCode c, Unicode u);
+  virtual GBool getCharPath(CharCode c, Unicode u, GfxState *state);
 
 private:
 
-  Guchar *getGlyphPixmap(Gushort c, int *x, int *y, int *w, int *h);
+  Guchar *getGlyphPixmap(CharCode c, int *x, int *y, int *w, int *h);
 
   T1FontFile *fontFile;
   int id;