xpdf303: Add GBool type1 to SplashFTFontFile

1 files changed, 0 insertions, 68 deletions

diff --git a/ALL_DIFF b/ALL_DIFF
index f402f75..9b89adc 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -5394,74 +5394,6 @@ diff -ru xpdf-3.02/splash/SplashFTFont.cc xpdf-3.03/splash/SplashFTFont.cc
      // skip the TrueType notdef glyph

      return NULL;

    }

-diff -ru xpdf-3.02/splash/SplashFTFontFile.cc xpdf-3.03/splash/SplashFTFontFile.cc

---- xpdf-3.02/splash/SplashFTFontFile.cc	2007-02-27 23:05:52.000000000 +0100

-+++ xpdf-3.03/splash/SplashFTFontFile.cc	2011-08-15 23:08:53.000000000 +0200

-     }

-   }

- 

-   return new SplashFTFontFile(engineA, idA, fileNameA, deleteFileA,

--			      faceA, codeToGIDA, 256, gFalse);

-+			      faceA, codeToGIDA, 256, gFalse, gTrue);

- }

- 

- SplashFontFile *SplashFTFontFile::loadCIDFont(SplashFTFontEngine *engineA,

- 					      SplashFontFileID *idA,

- 					      char *fileNameA,

- 					      GBool deleteFileA,

-@@ -59,31 +59,34 @@

-   }

- 

-   return new SplashFTFontFile(engineA, idA, fileNameA, deleteFileA,

--			      faceA, codeToGIDA, codeToGIDLenA, gFalse);

-+			      faceA, codeToGIDA, codeToGIDLenA,

-+			      gFalse, gFalse);

- }

- 

-   return new SplashFTFontFile(engineA, idA, fileNameA, deleteFileA,

--			      faceA, codeToGIDA, codeToGIDLenA, gTrue);

-+			      faceA, codeToGIDA, codeToGIDLenA,

-+			      gTrue, gFalse);

- }

- 

- SplashFTFontFile::SplashFTFontFile(SplashFTFontEngine *engineA,

- 				   SplashFontFileID *idA,

- 				   char *fileNameA, GBool deleteFileA,

- 				   FT_Face faceA,

-				   int *codeToGIDA, int codeToGIDLenA,

--				   GBool trueTypeA):

-+				   GBool trueTypeA, GBool type1A):

-   SplashFontFile(idA, fileNameA, deleteFileA)

- {

-   engine = engineA;

-@@ -91,6 +94,7 @@

-   codeToGID = codeToGIDA;

-   codeToGIDLen = codeToGIDLenA;

-   trueType = trueTypeA;

-+  type1 = type1A;

- }

- 

- SplashFTFontFile::~SplashFTFontFile() {

-diff -ru xpdf-3.02/splash/SplashFTFontFile.h xpdf-3.03/splash/SplashFTFontFile.h

---- xpdf-3.02/splash/SplashFTFontFile.h	2007-02-27 23:05:52.000000000 +0100

-+++ xpdf-3.03/splash/SplashFTFontFile.h	2011-08-15 23:08:53.000000000 +0200

-@@ -56,14 +57,15 @@

- 		   SplashFontFileID *idA,

- 		   char *fileNameA, GBool deleteFileA,

- 		   FT_Face faceA,

-		   int *codeToGIDA, int codeToGIDLenA,

--		   GBool trueTypeA);

-+		   GBool trueTypeA, GBool type1A);

- 

-   SplashFTFontEngine *engine;

-   FT_Face face;

-   int *codeToGID;

-   int codeToGIDLen;

-   GBool trueType;

-+  GBool type1;

- 

-   friend class SplashFTFont;

- };

 diff -ru xpdf-3.02/splash/Splash.h xpdf-3.03/splash/Splash.h

 --- xpdf-3.02/splash/Splash.h	2007-02-27 23:05:52.000000000 +0100

 +++ xpdf-3.03/splash/Splash.h	2011-08-15 23:08:53.000000000 +0200