Imported Xpdf 2.03 and fixed build.

[evince.git] / pdf / xpdf / FTFont.h

diff --git a/pdf/xpdf/FTFont.h b/pdf/xpdf/FTFont.h
index 52bc149b180a3d8f74fc7763ae7f6441b3bc1173..8da5558219e30bcf1a1cca2e627150646f7b7a46 100644 (file)
--- a/pdf/xpdf/FTFont.h
+++ b/pdf/xpdf/FTFont.h
@@ -48,9 +48,6 @@ private:
 
 enum FTFontIndexMode {
   ftFontModeUnicode,
 
 enum FTFontIndexMode {
   ftFontModeUnicode,

-  ftFontModeCharCode,
-  ftFontModeCharCodeOffset,
-  ftFontModeCodeMap,

   ftFontModeCodeMapDirect,
   ftFontModeCIDToGIDMap,
   ftFontModeCFFCharset,
   ftFontModeCodeMapDirect,
   ftFontModeCIDToGIDMap,
   ftFontModeCFFCharset,


@@ -62,8 +59,7 @@ public:
 
   // 8-bit font, TrueType or Type 1/1C
   FTFontFile(FTFontEngine *engineA, char *fontFileName,
 
   // 8-bit font, TrueType or Type 1/1C
   FTFontFile(FTFontEngine *engineA, char *fontFileName,

-            char **fontEnc, GBool pdfFontHasEncoding,
-            GBool pdfFontIsSymbolic);
+            char **fontEnc, Gushort *codeToGID);

 
   // CID font, TrueType
   FTFontFile(FTFontEngine *engineA, char *fontFileName,
 
   // CID font, TrueType
   FTFontFile(FTFontEngine *engineA, char *fontFileName,


@@ -81,7 +77,6 @@ private:
   FTFontEngine *engine;
   FT_Face face;
   FTFontIndexMode mode;
   FTFontEngine *engine;
   FT_Face face;
   FTFontIndexMode mode;

-  int charMapOffset;

   Guint *codeMap;
   Gushort *cidToGID;
   int cidToGIDLen;
   Guint *codeMap;
   Gushort *cidToGID;
   int cidToGIDLen;