X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2Fxpdf-changes.patch;h=2cdaf30c4f61c14ff04b0d69191fcab23b3a7ff1;hb=refs%2Fheads%2Fstartpage;hp=a4e27bc925fa8adec72bcbf3beae29b422dea210;hpb=b71b3ae392d33c96077350314ceb9b1a030adfab;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index a4e27bc..2cdaf30 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -85,15 +85,6 @@
      for (i = oldLen; i < mapLen; ++i) {
        map[i] = 0;
      }
---- xpdf/CoreOutputDev.cc.orig	2010-05-18 11:22:18.000000000 -0700
-+++ xpdf/CoreOutputDev.cc	2010-05-18 11:22:18.000000000 -0700
-@@ -57,5 +57,5 @@
- 
- void CoreOutputDev::clear() {
-   startDoc(NULL);
--  startPage(0, NULL);
-+  startPage(0, NULL, 0,0,0,0);
- }
 --- xpdf/Decrypt.cc.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/Decrypt.cc	2010-05-18 11:22:18.000000000 -0700
 @@ -596,6 +596,7 @@
@@ -106,19 +97,6 @@
      }
 --- xpdf/Gfx.cc.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/Gfx.cc	2010-05-18 11:22:18.000000000 -0700
-@@ -454,7 +454,11 @@
-   fontChanged = gFalse;
-   clip = clipNone;
-   ignoreUndef = 0;
--  out->startPage(pageNum, state);
-+  if(cropBox) {
-+      out->startPage(pageNum, state, cropBox->x1,cropBox->y1,cropBox->x2,cropBox->y2);
-+  } else {
-+      out->startPage(pageNum, state, 0,0,0,0);
-+  }
-   out->setDefaultCTM(state->getCTM());
-   out->updateAll(state);
-   for (i = 0; i < 6; ++i) {
 @@ -465,6 +469,7 @@
    abortCheckCbkData = abortCheckCbkDataA;
  
@@ -184,6 +162,15 @@
  
 --- xpdf/GfxFont.cc.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/GfxFont.cc	2010-05-18 11:22:18.000000000 -0700
+@@ -194,7 +194,7 @@
+       embFontID = obj2.getRef();
+       if (type != fontType1) {
+ 	error(-1, "Mismatch between font type and embedded font file");
+-	type = fontType1;
++	type = isCIDFont() ? fontCIDType0 : fontType1;
+       }
+     }
+     obj2.free();
 @@ -919,6 +919,10 @@
    return 1;
  }
@@ -656,6 +643,19 @@
    syms = (JBIG2Bitmap **)gmallocn(numSyms, sizeof(JBIG2Bitmap *));
 --- xpdf/JPXStream.cc.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/JPXStream.cc	2010-05-18 11:22:18.000000000 -0700
+@@ -241,6 +242,12 @@
+   haveCompMap = gFalse;
+   haveChannelDefn = gFalse;
+ 
++  img.xSize = 0;
++  img.ySize = 0;
++  img.xOffset = 0;
++  img.yOffset = 0;
++  curX = 0;
++  curY = 0;
+   img.tiles = NULL;
+   bitBuf = 0;
+   bitBufLen = 0;
 @@ -450,6 +450,7 @@
    GBool haveBPC, haveCSMode;
  
@@ -790,15 +790,6 @@
  
  class GString;
  class GfxState;
-@@ -94,7 +95,7 @@
-     { return gTrue; }
- 
-   // Start a page.
--  virtual void startPage(int pageNum, GfxState *state) {}
-+  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {}
- 
-   // End a page.
-   virtual void endPage() {}
 --- xpdf/SplashFTFont.cc.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/SplashFTFont.cc	2010-05-18 11:22:18.000000000 -0700
 @@ -46,6 +46,7 @@
@@ -951,15 +942,6 @@
  #include <math.h>
  #include "gfile.h"
  #include "GlobalParams.h"
-@@ -702,7 +703,7 @@
-   nT3Fonts = 0;
- }
- 
--void SplashOutputDev::startPage(int pageNum, GfxState *state) {
-+void SplashOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
-   int w, h;
-   double *ctm;
-   SplashCoord mat[6];
 @@ -2646,9 +2647,9 @@
  
    softMask = new SplashBitmap(bitmap->getWidth(), bitmap->getHeight(),
@@ -974,15 +956,6 @@
        tBitmap->getPixel(x, y, color);
 --- xpdf/SplashOutputDev.h.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/SplashOutputDev.h	2010-05-18 11:22:18.000000000 -0700
-@@ -70,7 +70,7 @@
-   //----- initialization and control
- 
-   // Start a page.
--  virtual void startPage(int pageNum, GfxState *state);
-+  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
- 
-   // End a page.
-   virtual void endPage();
 @@ -196,6 +196,9 @@
    virtual void setVectorAntialias(GBool vaa);
  #endif
@@ -1114,17 +1087,6 @@
  };
  
  //------------------------------------------------------------------------
---- xpdf/TextOutputDev.cc.orig	2010-05-18 11:22:18.000000000 -0700
-+++ xpdf/TextOutputDev.cc	2010-05-18 11:22:18.000000000 -0700
-@@ -3877,7 +3877,7 @@
-   }
- }
- 
--void TextOutputDev::startPage(int pageNum, GfxState *state) {
-+void TextOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
-   text->startPage(state);
- }
- 
 --- xpdf/TextOutputDev.h.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/TextOutputDev.h	2010-05-18 11:22:18.000000000 -0700
 @@ -170,6 +170,7 @@
@@ -1135,15 +1097,6 @@
  };
  
  //------------------------------------------------------------------------
-@@ -578,7 +579,7 @@
-   //----- initialization and control
- 
-   // Start a page.
--  virtual void startPage(int pageNum, GfxState *state);
-+  virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
- 
-   // End a page.
-   virtual void endPage();
 --- xpdf/gfile.cc.orig	2010-05-18 11:22:18.000000000 -0700
 +++ xpdf/gfile.cc	2010-05-18 11:22:18.000000000 -0700
 @@ -439,6 +439,52 @@