X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=47720ae3e865d29d29a1b44d779a523f2502b6ef;hb=6a529bfa890997a55fec9ae0e0d388cf9d5276c2;hp=869d2438a46cc6c43e54c3f158afaa3ad4e0d0e0;hpb=70cbf35a3b4b401f9a7c8a306804dab1856e274c;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 869d243..47720ae 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -134,6 +134,17 @@ diff -u -r1.10 -r1.12
  					   sizeof(GfxColorComp));
        for (i = 0; i <= maxPixel; ++i) {
  	lookup[k][i] = dblToCol(decodeLow[k] +
+@@ -3754,7 +3769,10 @@
+ }
+ 
+ void GfxState::setPath(GfxPath *pathA) {
++  if(pathA) {
++      if(path)
+   delete path;
++  }
+   path = pathA;
+ }
+
 Index: GlobalParams.cc
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.cc,v
@@ -172,16 +183,26 @@ diff -u -r1.4 -r1.7
    line = 1;
    while (getLine(buf, sizeof(buf) - 1, f)) {
  
-@@ -659,6 +682,32 @@
-   }
+@@ -1142,6 +1165,42 @@
+   deleteGList(tokens, GString);
  }
  
++static char is_absolute(char*filename)
++{
++    int l = strlen(filename);
++    if(filename[0] == '/' || filename[0] == '\\') 
++	return 1;
++    if(l>2 && filename[1]==':' && (filename[2]=='\\' || filename[2]=='/'))
++	return 1;
++    return 0;
++}
++
 +static GString* qualify_filename(GString*path, GString*filename)
 +{
 +  GString*fullpath = 0;
 +  char*prefix = "/usr/local/share/xpdf/";
 +
-+  if (filename->getChar(0) != '\\' && filename->getChar(0) != '/') {
++  if (!is_absolute(filename->getCString())) {
 +    /* relative path */
 +    fullpath = path->copy();
 +    fullpath->append(filename);
@@ -205,15 +226,20 @@ diff -u -r1.4 -r1.7
  void GlobalParams::parseNameToUnicode(GList *tokens, GString *fileName,
  					 int line) {
    GString *name;
-@@ -673,7 +722,7 @@
+@@ -1156,10 +1215,10 @@
  	  fileName->getCString(), line);
      return;
    }
 -  name = (GString *)tokens->get(1);
 +  name = qualify_filename(this->path, (GString *)tokens->get(1));
    if (!(f = fopen(name->getCString(), "r"))) {
-     error(-1, "Couldn't open 'nameToUnicode' file '%s'",
- 	  name->getCString());
+-    error(-1, "Couldn't open 'nameToUnicode' file '%s'",
+-	  name->getCString());
++    error(-1, "Couldn't open 'nameToUnicode' file '%s' using path '%s'",
++	  name->getCString(), path->getCString());
+     return;
+   }
+   line2 = 1;
 @@ -705,10 +754,12 @@
    }
    collection = (GString *)tokens->get(1);
@@ -443,7 +469,7 @@ diff -u -r1.7 -r1.8
  #include <string.h>
  #include <ctype.h>
 Index: config.h
---- config.h.orig	2007-09-09 12:11:20.000000000 +0200
+--- config.h	2007-09-09 12:11:20.000000000 +0200
 +++ config.h	2007-09-09 12:11:40.000000000 +0200
 @@ -53,9 +53,9 @@
  
@@ -580,6 +606,17 @@ retrieving revision 1.6
 diff -u -r1.5 -r1.6
 --- GlobalParams.h	2006-10-10 19:54:29.000000000 +0200
 +++ GlobalParams.h	2006-11-12 11:19:40.000000000 +0100
+@@ -213,8 +213,8 @@
+   FILE *getUnicodeMapFile(GString *encodingName);
+   FILE *findCMapFile(GString *collection, GString *cMapName);
+   FILE *findToUnicodeFile(GString *name);
+-  DisplayFontParam *getDisplayFont(GString *fontName);
+-  DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
++  virtual DisplayFontParam *getDisplayFont(GString *fontName);
++  virtual DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
+   GString *getPSFile();
+   int getPSPaperWidth();
+   int getPSPaperHeight();
 @@ -218,1 +218,1 @@
 -  void parseFile(GString *fileName, FILE *f);
 +public: void parseFile(GString *fileName, FILE *f); private:
@@ -594,7 +631,7 @@ diff -u -r1.5 -r1.6
    //----- static tables
  
    NameToCharCode *		// mapping from char name to
---- SplashOutputDev.h.orig	2006-11-12 12:07:22.000000000 +0100
+--- SplashOutputDev.h	2006-11-12 12:07:22.000000000 +0100
 +++ SplashOutputDev.h	2006-11-12 12:08:48.000000000 +0100
 @@ -70,7 +70,7 @@
    //----- initialization and control
@@ -605,7 +642,7 @@ diff -u -r1.5 -r1.6
  
    // End a page.
    virtual void endPage();
---- SplashOutputDev.cc.orig	2006-11-12 12:07:06.000000000 +0100
+--- SplashOutputDev.cc	2006-11-12 12:07:06.000000000 +0100
 +++ SplashOutputDev.cc	2006-11-12 12:09:36.000000000 +0100
 @@ -696,7 +696,7 @@
    nT3Fonts = 0;
@@ -616,7 +653,7 @@ diff -u -r1.5 -r1.6
    int w, h;
    double *ctm;
    SplashCoord mat[6];
---- TextOutputDev.h.orig	2006-11-12 12:23:01.000000000 +0100
+--- TextOutputDev.h	2006-11-12 12:23:01.000000000 +0100
 +++ TextOutputDev.h	2006-11-12 12:25:31.000000000 +0100
 @@ -578,7 +578,7 @@
    //----- initialization and control
@@ -627,7 +664,7 @@ diff -u -r1.5 -r1.6
  
    // End a page.
    virtual void endPage();
---- TextOutputDev.cc.orig	2006-11-12 12:22:53.000000000 +0100
+--- TextOutputDev.cc	2006-11-12 12:22:53.000000000 +0100
 +++ TextOutputDev.cc	2006-11-12 12:25:03.000000000 +0100
 @@ -3805,7 +3805,7 @@
    }
@@ -638,7 +675,7 @@ diff -u -r1.5 -r1.6
    text->startPage(state);
  }
  
---- CoreOutputDev.cc.orig	2006-11-12 12:21:59.000000000 +0100
+--- CoreOutputDev.cc	2006-11-12 12:21:59.000000000 +0100
 +++ CoreOutputDev.cc	2006-11-12 12:23:29.000000000 +0100
 @@ -57,5 +57,5 @@
  
@@ -659,7 +696,7 @@ diff -u -r1.5 -r1.6
  #include "gmem.h"
  #include "GString.h"
  #include "gfile.h"
---- SplashOutputDev.cc.orig	2007-09-09 12:29:45.000000000 +0200
+--- SplashOutputDev.cc	2007-09-09 12:29:45.000000000 +0200
 +++ SplashOutputDev.cc	2007-09-09 12:30:02.000000000 +0200
 @@ -13,6 +13,7 @@
  #endif
@@ -669,7 +706,7 @@ diff -u -r1.5 -r1.6
  #include <math.h>
  #include "gfile.h"
  #include "GlobalParams.h"
---- SplashFontFile.cc.orig	2007-09-09 12:33:00.000000000 +0200
+--- SplashFontFile.cc	2007-09-09 12:33:00.000000000 +0200
 +++ SplashFontFile.cc	2007-09-09 12:33:07.000000000 +0200
 @@ -11,9 +11,7 @@
  #endif
@@ -682,7 +719,7 @@ diff -u -r1.5 -r1.6
  #include "GString.h"
  #include "SplashFontFile.h"
  #include "SplashFontFileID.h"
---- SplashFont.orig.h	2007-09-09 14:23:47.000000000 +0200
+--- SplashFont.h	2007-09-09 14:23:47.000000000 +0200
 +++ SplashFont.h	2007-09-09 14:24:28.000000000 +0200
 @@ -73,6 +73,9 @@
    virtual GBool makeGlyph(int c, int xFrac, int yFrac,
@@ -694,7 +731,7 @@ diff -u -r1.5 -r1.6
    // Return the path for a glyph.
    virtual SplashPath *getGlyphPath(int c) = 0;
  
---- SplashFTFont.orig.h	2007-09-09 14:23:47.000000000 +0200
+--- 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,
@@ -706,7 +743,7 @@ diff -u -r1.5 -r1.6
    // Return the path for a glyph.
    virtual SplashPath *getGlyphPath(int c);
  
---- SplashFTFont.cc.orig.h	2007-09-09 14:23:50.000000000 +0200
+--- 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;
@@ -771,3 +808,61 @@ diff -u -r1.5 -r1.6
  int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
  			    Unicode *u, int uSize, int *uLen,
  			    double *dx, double *dy, double *ox, double *oy) {
+--- OutputDev.h	Sat Jul 28 00:11:08 2007
++++ OutputDev.h	Sun Sep  9 13:50:40 2007
+@@ -17,6 +17,7 @@
+ 
+ #include "gtypes.h"
+ #include "CharTypes.h"
++#include "Object.h"
+ 
+ class GString;
+ class Gfx;
+--- SplashOutputDev.h	2007-10-20 13:17:02.000000000 +0200
++++ SplashOutputDev.h	2007-10-20 13:17:23.000000000 +0200
+@@ -206,6 +206,7 @@
+   virtual void setVectorAntialias(GBool vaa);
+ #endif
+ 
++  void doUpdateFont(GfxState *state);
+ private:
+ 
+   void setupScreenParams(double hDPI, double vDPI);
+@@ -215,7 +216,6 @@
+   SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
+ #endif
+   SplashPath *convertPath(GfxState *state, GfxPath *path);
+-  void doUpdateFont(GfxState *state);
+   void drawType3Glyph(T3FontCache *t3Font,
+ 		      T3FontCacheTag *tag, Guchar *data);
+   static GBool imageMaskSrc(void *data, SplashColorPtr line);
+--- xpdf/GlobalParams.h 2007-10-20 13:18:03.000000000 +0200
++++ xpdf/GlobalParams.h	2007-10-20 13:25:52.000000000 +0200
+@@ -196,7 +196,7 @@
+   // file.
+   GlobalParams(char *cfgFileName);
+ 
+-  ~GlobalParams();
++  virtual ~GlobalParams();
+ 
+   void setBaseDir(char *dir);
+   void setupBaseFonts(char *dir);
+--- xpdf/SplashOutputDev.h.orig	2007-10-21 17:43:29.000000000 +0200
++++ xpdf/SplashOutputDev.h	2007-11-19 10:07:27.000000000 +0100
+@@ -197,6 +197,8 @@
+ #endif
+ 
+   void doUpdateFont(GfxState *state);
++  
++  SplashPath *convertPath(GfxState *state, GfxPath *path);
+ private:
+ 
+   void setupScreenParams(double hDPI, double vDPI);
+@@ -205,7 +207,6 @@
+ #else
+   SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
+ #endif
+-  SplashPath *convertPath(GfxState *state, GfxPath *path);
+   void drawType3Glyph(T3FontCache *t3Font,
+ 		      T3FontCacheTag *tag, Guchar *data);
+   static GBool imageMaskSrc(void *data, SplashColorPtr line);