X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpdf%2Fxpdf-changes.patch;h=625b9711037be3d64b1d881261adc2983a02c6ec;hb=4e518c7853f14ef0333975c2f6775884f44cf28d;hp=a4e27bc925fa8adec72bcbf3beae29b422dea210;hpb=b71b3ae392d33c96077350314ceb9b1a030adfab;p=swftools.git

diff --git a/lib/pdf/xpdf-changes.patch b/lib/pdf/xpdf-changes.patch
index a4e27bc..625b971 100644
--- a/lib/pdf/xpdf-changes.patch
+++ b/lib/pdf/xpdf-changes.patch
@@ -184,6 +184,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 +665,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;