xpdf-3.02 fixes

[swftools.git] / lib / pdf / xpdf-changes.patch

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index 7440748..b2b7a92 100644 (file)
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -1,24 +1,3 @@
-Index: FoFiType1C.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/FoFiType1C.cc,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- FoFiType1C.cc      3 Dec 2005 10:11:33 -0000       1.3
-+++ FoFiType1C.cc      3 Dec 2005 10:30:41 -0000       1.4
-@@ -231,8 +231,11 @@
-     (*outputFunc)(outputStream,
-                 "0 1 255 {1 index exch /.notdef put} for\n", 40);
-     enc = newEncoding ? newEncoding : encoding;
-+    if(!enc) {
-+      fprintf(stderr, "convertToType1: Warning: No Encoding\n");
-+    }
-     for (i = 0; i < 256; ++i) {
--      if (enc[i]) {
-+      if (enc && enc[i]) {
-       sprintf(buf, "dup %d /%s put\n", i, enc[i]);
-       (*outputFunc)(outputStream, buf, strlen(buf));
-       }
 Index: Gfx.cc
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Gfx.cc,v
@@ -38,7 +17,7 @@ diff -u -r1.9 -r1.10
    out->setDefaultCTM(state->getCTM());
    out->updateAll(state);
    for (i = 0; i < 6; ++i) {
-@@ -450,7 +450,9 @@
+@@ -450,7 +450,8 @@
    abortCheckCbkData = abortCheckCbkDataA;
  
    // set crop box
@@ -48,13 +27,13 @@ diff -u -r1.9 -r1.10
      state->moveTo(cropBox->x1, cropBox->y1);
      state->lineTo(cropBox->x2, cropBox->y1);
      state->lineTo(cropBox->x2, cropBox->y2);
-@@ -459,7 +459,7 @@
+@@ -459,7 +460,8 @@
      state->clip();
      out->clip(state);
      state->clearPath();
 -  }
 +  }
-+#endif XPDFEXE
++#endif
  }
  
  Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
@@ -318,28 +297,6 @@ diff -u -r1.4 -r1.7
      break;
    }
  
-Index: GlobalParams.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.h,v
-retrieving revision 1.5
-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
-@@ -357,6 +357,10 @@
-   GBool loadPlugin(char *type, char *name);
- #endif
- 
-+  //----- config file base path
-+
-+  GString*path;
-+
-   //----- static tables
- 
-   NameToCharCode *            // mapping from char name to
-j@@ -318,1 +318,1 @@
--  void parseFile(GString *fileName, FILE *f);
-+public: void parseFile(GString *fileName, FILE *f); private:
 Index: Lexer.cc
 ===================================================================
 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Lexer.cc,v
@@ -649,17 +606,28 @@ diff -u -r1.9 -r1.10
  // Append a file name to a path string.  <path> may be an empty
  // string, denoting the current directory).  Returns <path>.
  extern GString *appendToPath(GString *path, char *fileName);
---- pdf/xpdf-3.01.16/GlobalParams.h    2006-11-12 11:20:54.000000000 +0100
-+++ j  2006-11-12 11:19:40.000000000 +0100
-@@ -315,7 +315,7 @@
- private:
- 
-   void createDefaultKeyBindings();
+Index: GlobalParams.h
+===================================================================
+RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.h,v
+retrieving revision 1.5
+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
+@@ -218,1 +218,1 @@
 -  void parseFile(GString *fileName, FILE *f);
 +public: void parseFile(GString *fileName, FILE *f); private:
-   void parseNameToUnicode(GList *tokens, GString *fileName, int line);
-   void parseCIDToUnicode(GList *tokens, GString *fileName, int line);
-   void parseUnicodeToUnicode(GList *tokens, GString *fileName, int line);
+@@ -246,6 +246,10 @@
+   GBool loadPlugin(char *type, char *name);
+ #endif
+ 
++  //----- config file base path
++
++  GString*path;
++
+   //----- 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:08:48.000000000 +0100
 @@ -70,7 +70,7 @@
@@ -713,3 +681,15 @@ diff -u -r1.9 -r1.10
 -  startPage(0, NULL);
 +  startPage(0, NULL, 0,0,0,0);
  }
+--- SplashFTFontEngine.cc      2006-11-19 22:30:44.000000000 +0100
++++ SplashFTFontEngine.cc      2006-11-19 22:30:56.000000000 +0100
+@@ -13,9 +13,7 @@
+ #endif
+ 
+ #include <stdio.h>
+-#ifndef WIN32
+ #  include <unistd.h>
+-#endif
+ #include "gmem.h"
+ #include "GString.h"
+ #include "gfile.h"