X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=pdf%2Fxpdf%2FFTFont.h;h=52bc149b180a3d8f74fc7763ae7f6441b3bc1173;hb=884f739665dc56e66f51e104350f2affd33f2dd8;hp=4894a3168ddebde95b6fe074b6740d22a96c1143;hpb=2a393c134fe3fe8eb85bf818cb7ad6ae4396322a;p=evince.git

diff --git a/pdf/xpdf/FTFont.h b/pdf/xpdf/FTFont.h
index 4894a316..52bc149b 100644
--- a/pdf/xpdf/FTFont.h
+++ b/pdf/xpdf/FTFont.h
@@ -4,16 +4,18 @@
 //
 // An X wrapper for the FreeType font rasterizer.
 //
-// Copyright 2001-2002 Glyph & Cog, LLC
+// Copyright 2001-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifndef FTFONT_H
 #define FTFONT_H
 
+#include <aconf.h>
+
 #if FREETYPE2 && (HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H)
 
-#ifdef __GNUC__
+#ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
 
@@ -51,7 +53,8 @@ enum FTFontIndexMode {
   ftFontModeCodeMap,
   ftFontModeCodeMapDirect,
   ftFontModeCIDToGIDMap,
-  ftFontModeCFFCharset
+  ftFontModeCFFCharset,
+  ftFontModeCID
 };
 
 class FTFontFile: public SFontFile {
@@ -59,14 +62,16 @@ public:
 
   // 8-bit font, TrueType or Type 1/1C
   FTFontFile(FTFontEngine *engineA, char *fontFileName,
-	     char **fontEnc, GBool pdfFontHasEncoding);
+	     char **fontEnc, GBool pdfFontHasEncoding,
+	     GBool pdfFontIsSymbolic);
 
   // CID font, TrueType
   FTFontFile(FTFontEngine *engineA, char *fontFileName,
-	     Gushort *cidToGIDA, int cidToGIDLenA);
+	     Gushort *cidToGIDA, int cidToGIDLenA, GBool embedded);
 
   // CID font, Type 0C (CFF)
-  FTFontFile(FTFontEngine *engineA, char *fontFileName);
+  FTFontFile(FTFontEngine *engineA, char *fontFileName,
+	     GBool embedded);
 
   GBool isOk() { return ok; }
   virtual ~FTFontFile();
@@ -107,7 +112,8 @@ public:
 private:
 
   Guchar *getGlyphPixmap(CharCode c, Unicode u,
-			 int *x, int *y, int *w, int *h);
+			 int *x, int *y, int *w, int *h,
+			 GBool *tempBitmap);
   static int charPathMoveTo(FT_Vector *pt, void *state);
   static int charPathLineTo(FT_Vector *pt, void *state);
   static int charPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *state);