X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=d2459d52728553d2cb5f625568e42d2e6c0fb1f6;hb=39256331a887c5d462253ab1aea538ee2e4fd4ba;hp=4036abd4f4007ce4abe14ca627a3e5adec6db335;hpb=5813643e4b1b0f0662d22dbaac3598cf1c55cb07;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 4036abd..d2459d5 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -443,17 +443,12 @@ diff -u -r1.7 -r1.8
  #include <string.h>
  #include <ctype.h>
 Index: config.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/config.h,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- config.h	3 Dec 2005 10:11:33 -0000	1.5
-+++ config.h	3 Dec 2005 10:30:41 -0000	1.6
-@@ -53,18 +53,18 @@
+--- config.h	2007-09-09 12:11:20.000000000 +0200
++++ config.h	2007-09-09 12:11:40.000000000 +0200
+@@ -53,9 +53,9 @@
  
  // user config file name, relative to the user's home directory
- #if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__))
+ #if defined(VMS) || defined(WIN32)
 -#define xpdfUserConfigFile "xpdfrc"
 +#define xpdfUserConfigFile "pdf2swf.conf"
  #else
@@ -462,10 +457,7 @@ diff -u -r1.5 -r1.6
  #endif
  
  // system config file name (set via the configure script)
--#ifdef SYSTEM_XPDFRC
--#define xpdfSysConfigFile SYSTEM_XPDFRC
-+#ifndef WIN32
-+#define xpdfSysConfigFile "/etc/pdf2swf.conf"
+@@ -64,7 +64,7 @@
  #else
  // under Windows, we get the directory with the executable and then
  // append this file name
@@ -588,6 +580,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:
@@ -602,7 +605,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
@@ -613,7 +616,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;
@@ -624,7 +627,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
@@ -635,7 +638,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 @@
    }
@@ -646,7 +649,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 @@
  
@@ -667,3 +670,154 @@ diff -u -r1.5 -r1.6
  #include "gmem.h"
  #include "GString.h"
  #include "gfile.h"
+--- 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
+ 
+ #include <string.h>
++#include <unistd.h>
+ #include <math.h>
+ #include "gfile.h"
+ #include "GlobalParams.h"
+--- 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
+ 
+ #include <stdio.h>
+-#ifndef WIN32
+-#  include <unistd.h>
+-#endif
++#include <unistd.h>
+ #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
+@@ -73,6 +73,9 @@
+   virtual GBool makeGlyph(int c, int xFrac, int yFrac,
+ 			  SplashGlyphBitmap *bitmap) = 0;
+ 
++  // return the number of characters in this font
++  virtual int getNumChars() = 0;
++
+   // 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);
+ 
+--- 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;
+ };
+ 
++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
+--- 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 @@
+   virtual int getNextChar(char *s, int len, CharCode *code,
+ 			  Unicode *u, int uSize, int *uLen,
+ 			  double *dx, double *dy, double *ox, double *oy) = 0;
++  virtual CharCodeToUnicode* getCTU() = 0;
+ 
+ protected:
+ 
+@@ -204,6 +205,7 @@
+   virtual int getNextChar(char *s, int len, CharCode *code,
+ 			  Unicode *u, int uSize, int *uLen,
+ 			  double *dx, double *dy, double *ox, double *oy);
++  virtual CharCodeToUnicode* getCTU();
+ 
+   // Return the encoding.
+   char **getEncoding() { return enc; }
+@@ -266,6 +268,7 @@
+   virtual int getNextChar(char *s, int len, CharCode *code,
+ 			  Unicode *u, int uSize, int *uLen,
+ 			  double *dx, double *dy, double *ox, double *oy);
++  virtual CharCodeToUnicode* getCTU();
+ 
+   // Return the writing mode (0=horizontal, 1=vertical).
+   virtual int getWMode();
+--- orig/GfxFont.cc	2007-07-28 00:11:06.000000000 +0200
++++ GfxFont.cc	2007-09-09 18:33:37.000000000 +0200
+@@ -925,6 +925,10 @@
+   return 1;
+ }
+ 
++CharCodeToUnicode* Gfx8BitFont::getCTU() {
++    return ctu;
++}
++
+ CharCodeToUnicode *Gfx8BitFont::getToUnicode() {
+   ctu->incRefCnt();
+   return ctu;
+@@ -1417,6 +1421,10 @@
+   }
+ }
+ 
++CharCodeToUnicode* GfxCIDFont::getCTU() {
++    return ctu;
++}
++
+ 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);