--- 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;
}
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;