X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=2247f5fdd005ad4948b940d9851cb1da90176254;hp=47720ae3e865d29d29a1b44d779a523f2502b6ef;hb=b0d6b177b15ec7aff4c132353366b946aa382a89;hpb=9c7bd5ecdc923b1c30d48fe4178bad8ca8628052

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 47720ae..2247f5f 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -39,6 +39,24 @@ diff -u -r1.9 -r1.10
  }
  
  Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
+@@ -3783,6 +3789,7 @@
+   pushResources(resDict);
+ 
+   // save current graphics state
++  GfxState*mystate = state;
+   saveState();
+ 
+   // kill any pre-existing path
+@@ -3848,6 +3855,9 @@
+ 
+   // restore graphics state
+   restoreState();
++  if(state!=mystate) {
++      fprintf(stderr, "Invalid state nesting in PDF file- file broken?\n");
++  }
+ 
+   // pop resource stack
+   popResources();
 Index: GfxFont.h
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GfxFont.h,v
@@ -492,94 +510,6 @@ Index: config.h
  #endif
  
  //------------------------------------------------------------------------
-Index: gfile.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.cc,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
---- gfile.cc	3 Dec 2005 10:11:33 -0000	1.12
-+++ gfile.cc	3 Dec 2005 10:30:41 -0000	1.13
-@@ -437,6 +437,52 @@
- #endif
- }
- 
-+static char* getTempDir()
-+{
-+#ifdef WIN32
-+    char*dir = getenv("TMP");
-+    if(!dir) dir = getenv("TEMP");
-+    if(!dir) dir = getenv("tmp");
-+    if(!dir) dir = getenv("temp");
-+    if(!dir) dir = "C:\\";
-+#else
-+    char* dir = "/tmp/";
-+#endif
-+    return dir;
-+}
-+
-+char* mktmpname(char*ptr) {
-+    static char tmpbuf[128];
-+    char*dir = getTempDir();
-+    int l = strlen(dir);
-+    char*sep = "";
-+    if(!ptr)
-+	ptr = tmpbuf;
-+    if(l && dir[l-1]!='/' && dir[l-1]!='\\') {
-+#ifdef WIN32
-+	sep = "\\";
-+#else
-+	sep = "/";
-+#endif
-+    }
-+
-+ //   used to be mktemp. This does remove the warnings, but
-+ //   It's not exactly an improvement.
-+#ifdef HAVE_LRAND48
-+    sprintf(ptr, "%s%s%08x%08x",dir,sep,lrand48(),lrand48());
-+#else
-+#   ifdef HAVE_RAND
-+	sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand());
-+#   else
-+	static int count = 1;
-+	sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count);
-+	count ++;
-+#   endif
-+#endif
-+     return ptr;
-+}
-+
-+
- GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) {
- #if defined(WIN32)
-   //---------- Win32 ----------
-@@ -463,7 +509,7 @@
-   // with this file name after the tmpnam call and before the fopen
-   // call.  I will happily accept fixes to this function for non-Unix
-   // OSs.
--  if (!(s = tmpnam(NULL))) {
-+  if (!(s = mktmpname(NULL))) {
-     return gFalse;
-   }
-   *name = new GString(s);
-@@ -490,7 +536,7 @@
-     (*name)->append("/XXXXXX")->append(ext);
-     fd = mkstemps((*name)->getCString(), strlen(ext));
- #else
--    if (!(s = tmpnam(NULL))) {
-+    if (!(s = mktmpname(NULL))) {
-       return gFalse;
-     }
-     *name = new GString(s);
-@@ -507,7 +553,7 @@
-     (*name)->append("/XXXXXX");
-     fd = mkstemp((*name)->getCString());
- #else // HAVE_MKSTEMP
--    if (!(s = tmpnam(NULL))) {
-+    if (!(s = mktmpname(NULL))) {
-       return gFalse;
-     }
-     *name = new GString(s);
 Index: gfile.h
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v
@@ -719,8 +649,8 @@ diff -u -r1.5 -r1.6
  #include "GString.h"
  #include "SplashFontFile.h"
  #include "SplashFontFileID.h"
---- SplashFont.h	2007-09-09 14:23:47.000000000 +0200
-+++ SplashFont.h	2007-09-09 14:24:28.000000000 +0200
+--- xpdf/SplashFont.h.orig	2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFont.h	2008-10-05 17:36:44.000000000 +0200
 @@ -73,6 +73,9 @@
    virtual GBool makeGlyph(int c, int xFrac, int yFrac,
  			  SplashGlyphBitmap *bitmap) = 0;
@@ -731,33 +661,16 @@ diff -u -r1.5 -r1.6
    // Return the path for a glyph.
    virtual SplashPath *getGlyphPath(int c) = 0;
  
---- SplashFTFont.h	2007-09-09 14:23:47.000000000 +0200
-+++ SplashFTFont.h	2007-09-09 14:25:19.000000000 +0200
-@@ -42,6 +42,9 @@
-   virtual GBool makeGlyph(int c, int xFrac, int yFrac,
- 			  SplashGlyphBitmap *bitmap);
- 
-+  // return the number of characters in this font
-+  virtual int getNumChars();
-+
-   // Return the path for a glyph.
-   virtual SplashPath *getGlyphPath(int c);
+@@ -83,6 +86,9 @@
+   void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA)
+     { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; }
  
---- SplashFTFont.cc.h	2007-09-09 14:23:50.000000000 +0200
-+++ SplashFTFont.cc	2007-09-09 14:27:35.000000000 +0200
-@@ -228,6 +228,12 @@
-   GBool needClose;
- };
++  double ascender;
++  double descender;
++  double last_advance; //set after getGlyphPath()
+ protected:
  
-+int SplashFTFont::getNumChars()
-+{
-+  SplashFTFontFile* ff = (SplashFTFontFile *)fontFile;
-+  return ff->face->num_glyphs;
-+}
-+
- SplashPath *SplashFTFont::getGlyphPath(int c) {
-   static FT_Outline_Funcs outlineFuncs = {
- #if FREETYPE_MINOR <= 1
+   SplashFontFile *fontFile;
 --- orig/GfxFont.h	2007-07-28 00:11:06.000000000 +0200
 +++ GfxFont.h	2007-09-09 18:31:31.000000000 +0200
 @@ -164,6 +164,7 @@
@@ -866,3 +779,200 @@ diff -u -r1.5 -r1.6
    void drawType3Glyph(T3FontCache *t3Font,
  		      T3FontCacheTag *tag, Guchar *data);
    static GBool imageMaskSrc(void *data, SplashColorPtr line);
+--- xpdf/SplashFont.cc.orig	2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFont.cc	2008-10-05 17:37:08.000000000 +0200
+@@ -48,6 +48,10 @@
+   cacheTags = NULL;
+ 
+   xMin = yMin = xMax = yMax = 0;
++
++  last_advance = -1;
++  ascender = -1;
++  descender = -1;
+ }
+ 
+ void SplashFont::initCache() {
+--- xpdf/SplashFTFont.cc.orig	2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFTFont.cc	2008-10-05 17:37:32.000000000 +0200
+@@ -46,6 +46,7 @@
+   int x, y;
+ 
+   face = fontFileA->face;
++  
+   if (FT_New_Size(face, &sizeObj)) {
+     return;
+   }
+@@ -54,6 +55,10 @@
+   if (FT_Set_Pixel_Sizes(face, 0, (int)size)) {
+     return;
+   }
++ 
++  this->ascender = face->ascender;
++  this->descender = face->descender;
++
+   // if the textMat values are too small, FreeType's fixed point
+   // arithmetic doesn't work so well
+   textScale = splashSqrt(textMat[2]*textMat[2] + textMat[3]*textMat[3]) / size;
+@@ -228,6 +233,12 @@
+   GBool needClose;
+ };
+ 
++int SplashFTFont::getNumChars()
++{
++  SplashFTFontFile* ff = (SplashFTFontFile *)fontFile;
++  return ff->face->num_glyphs;
++}
++
+ SplashPath *SplashFTFont::getGlyphPath(int c) {
+   static FT_Outline_Funcs outlineFuncs = {
+ #if FREETYPE_MINOR <= 1
+@@ -249,6 +260,8 @@
+   FT_UInt gid;
+   FT_Glyph glyph;
+ 
++  this->last_advance = -1;
++
+   ff = (SplashFTFontFile *)fontFile;
+   ff->face->size = sizeObj;
+   FT_Set_Transform(ff->face, &textMatrix, NULL);
+@@ -268,6 +281,8 @@
+   if (FT_Get_Glyph(slot, &glyph)) {
+     return NULL;
+   }
++  this->last_advance = glyph->advance.x/65536.0;
++
+   path.path = new SplashPath();
+   path.textScale = textScale;
+   path.needClose = gFalse;
+--- xpdf/SplashFTFont.h.orig	2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFTFont.h	2008-10-04 17:39:57.000000000 +0200
+@@ -42,6 +42,9 @@
+   virtual GBool makeGlyph(int c, int xFrac, int yFrac,
+ 			  SplashGlyphBitmap *bitmap);
+ 
++  // return the number of characters in this font
++  virtual int getNumChars();
++
+   // Return the path for a glyph.
+   virtual SplashPath *getGlyphPath(int c);
+ 
+--- xpdf/SplashScreen.cc.orig	2008-10-06 17:59:44.000000000 +0200
++++ xpdf/SplashScreen.cc	2008-10-06 18:20:09.000000000 +0200
+@@ -363,6 +363,8 @@
+ int SplashScreen::test(int x, int y, Guchar value) {
+   int xx, yy;
+ 
++  return 1;
++
+   if (value < minVal) {
+     return 0;
+   }
+--- xpdf/gfile.cc.orig	2007-02-27 23:05:51.000000000 +0100
++++ xpdf/gfile.cc	2008-10-12 15:15:22.000000000 +0200
+@@ -439,6 +439,52 @@
+ #endif
+ }
+ 
++static char* getTempDir()
++{
++#ifdef WIN32
++    char*dir = getenv("TMP");
++    if(!dir) dir = getenv("TEMP");
++    if(!dir) dir = getenv("tmp");
++    if(!dir) dir = getenv("temp");
++    if(!dir) dir = "C:\\";
++#else
++    char* dir = "/tmp/";
++#endif
++    return dir;
++}
++
++char* mktmpname(char*ptr) {
++    static char tmpbuf[128];
++    char*dir = getTempDir();
++    int l = strlen(dir);
++    char*sep = "";
++    if(!ptr)
++	ptr = tmpbuf;
++    if(l && dir[l-1]!='/' && dir[l-1]!='\\') {
++#ifdef WIN32
++	sep = "\\";
++#else
++	sep = "/";
++#endif
++    }
++
++ //   used to be mktemp. This does remove the warnings, but
++ //   It's not exactly an improvement.
++#ifdef HAVE_LRAND48
++    sprintf(ptr, "%s%s%08x%08x",dir,sep,lrand48(),lrand48());
++#else
++#   ifdef HAVE_RAND
++	sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand());
++#   else
++	static int count = 1;
++	sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count);
++	count ++;
++#   endif
++#endif
++     return ptr;
++}
++
++
+ GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) {
+ #if defined(WIN32)
+   //---------- Win32 ----------
+@@ -460,7 +506,7 @@
+   s->append("x");
+   t = (int)time(NULL);
+   for (i = 0; i < 1000; ++i) {
+-    sprintf(buf, "%d", t + i);
++    sprintf(buf, "%08x-%08x", t + i, GetCurrentThreadId());
+     s2 = s->copy()->append(buf);
+     if (ext) {
+       s2->append(ext);
+@@ -468,8 +514,7 @@
+     if (!(f2 = fopen(s2->getCString(), "r"))) {
+       if (!(f2 = fopen(s2->getCString(), mode))) {
+ 	delete s2;
+-	delete s;
+-	return gFalse;
++        continue;
+       }
+       *name = s2;
+       *f = f2;
+@@ -479,6 +524,7 @@
+     fclose(f2);
+     delete s2;
+   }
++  fprintf(stderr, "Couldn't create temporary file\n");
+   delete s;
+   return gFalse;
+ #elif defined(VMS) || defined(__EMX__) || defined(ACORN) || defined(MACOS)
+@@ -489,7 +535,7 @@
+   // with this file name after the tmpnam call and before the fopen
+   // call.  I will happily accept fixes to this function for non-Unix
+   // OSs.
+-  if (!(s = tmpnam(NULL))) {
++  if (!(s = mktmpname(NULL))) {
+     return gFalse;
+   }
+   *name = new GString(s);
+@@ -516,7 +562,7 @@
+     (*name)->append("/XXXXXX")->append(ext);
+     fd = mkstemps((*name)->getCString(), strlen(ext));
+ #else
+-    if (!(s = tmpnam(NULL))) {
++    if (!(s = mktmpname(NULL))) {
+       return gFalse;
+     }
+     *name = new GString(s);
+@@ -533,7 +579,7 @@
+     (*name)->append("/XXXXXX");
+     fd = mkstemp((*name)->getCString());
+ #else // HAVE_MKSTEMP
+-    if (!(s = tmpnam(NULL))) {
++    if (!(s = mktmpname(NULL))) {
+       return gFalse;
+     }
+     *name = new GString(s);