-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
diff -u -r1.9 -r1.10
--- Gfx.cc 3 Dec 2005 10:11:33 -0000 1.9
+++ Gfx.cc 3 Dec 2005 10:30:41 -0000 1.10
-@@ -439,7 +439,9 @@
+@@ -439,7 +439,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);
state->clearPath();
- }
+ }
-+#endif XPDFEXE
++#endif
}
Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
sizeof(GfxColorComp));
for (i = 0; i <= maxPixel; ++i) {
lookup[k][i] = dblToCol(decodeLow[k] +
+@@ -3754,7 +3769,10 @@
+ }
+
+ void GfxState::setPath(GfxPath *pathA) {
++ if(pathA) {
++ if(path)
+ delete path;
++ }
+ path = pathA;
+ }
+
Index: GlobalParams.cc
===================================================================
RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.cc,v
line = 1;
while (getLine(buf, sizeof(buf) - 1, f)) {
-@@ -659,6 +682,32 @@
- }
+@@ -1142,6 +1165,42 @@
+ deleteGList(tokens, GString);
}
++static char is_absolute(char*filename)
++{
++ int l = strlen(filename);
++ if(filename[0] == '/' || filename[0] == '\\')
++ return 1;
++ if(l>2 && filename[1]==':' && (filename[2]=='\\' || filename[2]=='/'))
++ return 1;
++ return 0;
++}
++
+static GString* qualify_filename(GString*path, GString*filename)
+{
+ GString*fullpath = 0;
+ char*prefix = "/usr/local/share/xpdf/";
+
-+ if (filename->getChar(0) != '\\' && filename->getChar(0) != '/') {
++ if (!is_absolute(filename->getCString())) {
+ /* relative path */
+ fullpath = path->copy();
+ fullpath->append(filename);
void GlobalParams::parseNameToUnicode(GList *tokens, GString *fileName,
int line) {
GString *name;
-@@ -673,7 +722,7 @@
+@@ -1156,10 +1215,10 @@
fileName->getCString(), line);
return;
}
- name = (GString *)tokens->get(1);
+ name = qualify_filename(this->path, (GString *)tokens->get(1));
if (!(f = fopen(name->getCString(), "r"))) {
- error(-1, "Couldn't open 'nameToUnicode' file '%s'",
- name->getCString());
+- error(-1, "Couldn't open 'nameToUnicode' file '%s'",
+- name->getCString());
++ error(-1, "Couldn't open 'nameToUnicode' file '%s' using path '%s'",
++ name->getCString(), path->getCString());
+ return;
+ }
+ line2 = 1;
@@ -705,10 +754,12 @@
}
collection = (GString *)tokens->get(1);
// End a page.
virtual void endPage() {}
-Index: Page.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Page.cc,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- Page.cc 3 Dec 2005 10:11:33 -0000 1.5
-+++ Page.cc 3 Dec 2005 10:30:41 -0000 1.6
-@@ -66,6 +66,19 @@
- cropBox = mediaBox;
- }
-
-+ /* if the crop box is larger than the media box, cut it down to
-+ media box size */
-+ if(haveCropBox &&
-+ mediaBox.x1 <= cropBox.x2 &&
-+ mediaBox.y1 <= cropBox.y2 &&
-+ cropBox.x1 <= mediaBox.x2 &&
-+ cropBox.y1 <= mediaBox.y2) {
-+ if(mediaBox.x1 >= cropBox.x1) cropBox.x1 = mediaBox.x1;
-+ if(mediaBox.y1 >= cropBox.y1) cropBox.y1 = mediaBox.y1;
-+ if(mediaBox.x2 <= cropBox.x2) cropBox.x2 = mediaBox.x2;
-+ if(mediaBox.y2 <= cropBox.y2) cropBox.y2 = mediaBox.y2;
-+ }
-+
- // other boxes
- bleedBox = cropBox;
- readBox(dict, "BleedBox", &bleedBox);
Index: Stream.cc
===================================================================
RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Stream.cc,v
#endif
#include <string.h>
#include <ctype.h>
-Index: config.h
+Index: gfile.h
+===================================================================
+RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- gfile.h 3 Dec 2005 10:11:33 -0000 1.9
++++ gfile.h 3 Dec 2005 10:30:41 -0000 1.10
+@@ -58,6 +58,9 @@
+ // Get current directory.
+ extern GString *getCurrentDir();
+
++/* create a temporary filename */
++char* mktmpname(char*ptr);
++
+ // 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);
+Index: GlobalParams.h
===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/config.h,v
+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
---- 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 @@
-
- // user config file name, relative to the user's home directory
- #if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__))
--#define xpdfUserConfigFile "xpdfrc"
-+#define xpdfUserConfigFile "pdf2swf.conf"
- #else
--#define xpdfUserConfigFile ".xpdfrc"
-+#define xpdfUserConfigFile ".pdf2swf.conf"
+--- 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:
+@@ -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 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
+
+ // 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();
+--- TextOutputDev.cc 2006-11-12 12:22:53.000000000 +0100
++++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100
+@@ -3805,7 +3805,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);
+ }
+
+--- CoreOutputDev.cc 2006-11-12 12:21:59.000000000 +0100
++++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100
+@@ -57,5 +57,5 @@
+
+ void CoreOutputDev::clear() {
+ startDoc(NULL);
+- 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"
+--- 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"
+@@ -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(),
+ 1, splashModeMono8, gFalse);
+- memset(softMask->getDataPtr(), 0,
+- softMask->getRowSize() * softMask->getHeight());
++ memset(softMask->getDataPtr(), 0x00, softMask->getRowSize()*softMask->getHeight());
+ p = softMask->getDataPtr() + ty * softMask->getRowSize() + tx;
++ if (tx<softMask->getWidth() && ty<softMask->getHeight())
+ for (y = 0; y < tBitmap->getHeight(); ++y) {
+ for (x = 0; x < tBitmap->getWidth(); ++x) {
+ tBitmap->getPixel(x, y, color);
+--- 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
- // system config file name (set via the configure script)
--#ifdef SYSTEM_XPDFRC
--#define xpdfSysConfigFile SYSTEM_XPDFRC
-+#ifndef WIN32
-+#define xpdfSysConfigFile "/etc/pdf2swf.conf"
+ #include <stdio.h>
+-#ifndef WIN32
+-# include <unistd.h>
+-#endif
++#include <unistd.h>
+ #include "GString.h"
+ #include "SplashFontFile.h"
+ #include "SplashFontFileID.h"
+--- xpdf/SplashFont.h.orig 2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFont.h 2008-10-05 17:36:44.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;
+
+@@ -83,6 +86,9 @@
+ void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA)
+ { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; }
+
++ double ascender;
++ double descender;
++ double last_advance; //set after getGlyphPath()
+ protected:
+
+ SplashFontFile *fontFile;
+--- 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);
+--- xpdf/SplashOutputDev.h.orig 2007-10-21 17:43:29.000000000 +0200
++++ xpdf/SplashOutputDev.h 2007-11-19 10:07:27.000000000 +0100
+@@ -197,6 +197,8 @@
+ #endif
+
+ void doUpdateFont(GfxState *state);
++
++ SplashPath *convertPath(GfxState *state, GfxPath *path);
+ private:
+
+ void setupScreenParams(double hDPI, double vDPI);
+@@ -205,7 +207,6 @@
#else
- // under Windows, we get the directory with the executable and then
- // append this file name
--#define xpdfSysConfigFile "xpdfrc"
-+#define xpdfSysConfigFile "pdf2swf.conf"
+ SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
#endif
+- SplashPath *convertPath(GfxState *state, GfxPath *path);
+ void drawType3Glyph(T3FontCache *t3Font,
+ T3FontCacheTag *tag, Guchar *data);
+ static GBool imageMaskSrc(void *data, SplashColorPtr line);
+--- xpdf/SplashFont.cc.orig 2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFont.cc 2008-10-05 17:37:08.000000000 +0200
+@@ -48,6 +48,10 @@
+ cacheTags = NULL;
- //------------------------------------------------------------------------
-Index: gfile.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.cc,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
---- gfile.cc 3 Dec 2005 10:11:33 -0000 1.12
-+++ gfile.cc 3 Dec 2005 10:30:41 -0000 1.13
-@@ -437,6 +437,52 @@
+ xMin = yMin = xMax = yMax = 0;
++
++ last_advance = -1;
++ ascender = -1;
++ descender = -1;
+ }
+
+ void SplashFont::initCache() {
+--- xpdf/SplashFTFont.cc.orig 2009-03-08 17:19:08.000000000 +0100
++++ xpdf/SplashFTFont.cc 2009-03-15 19:18:11.000000000 +0100
+@@ -46,6 +46,7 @@
+ int x, y;
+
+ face = fontFileA->face;
++
+ if (FT_New_Size(face, &sizeObj)) {
+ return;
+ }
+@@ -54,6 +55,10 @@
+ if (FT_Set_Pixel_Sizes(face, 0, (int)size)) {
+ return;
+ }
++
++ this->ascender = face->ascender;
++ this->descender = face->descender;
++
+ // if the textMat values are too small, FreeType's fixed point
+ // arithmetic doesn't work so well
+ textScale = splashSqrt(textMat[2]*textMat[2] + textMat[3]*textMat[3]) / size;
+@@ -228,6 +233,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
+@@ -249,6 +260,8 @@
+ FT_UInt gid;
+ FT_Glyph glyph;
+
++ this->last_advance = -1;
++
+ ff = (SplashFTFontFile *)fontFile;
+ ff->face->size = sizeObj;
+ FT_Set_Transform(ff->face, &textMatrix, NULL);
+@@ -262,17 +275,24 @@
+ // skip the TrueType notdef glyph
+ return NULL;
+ }
+- if (FT_Load_Glyph(ff->face, gid, FT_LOAD_NO_BITMAP)) {
++ int error = 0;
++ if ((error=FT_Load_Glyph(ff->face, gid, FT_LOAD_NO_BITMAP|FT_LOAD_NO_HINTING))) {
++ fprintf(stderr, "Truetype wasn't able to load glyph %d, error %d\n", gid, error);
+ return NULL;
+ }
+ if (FT_Get_Glyph(slot, &glyph)) {
+ return NULL;
+ }
++ this->last_advance = glyph->advance.x/65536.0;
++
+ path.path = new SplashPath();
+ path.textScale = textScale;
+ path.needClose = gFalse;
+- FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline,
++ error = FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline,
+ &outlineFuncs, &path);
++ if(error) {
++ fprintf(stderr, "Truetype wasn't able to read glyph %d, error %d\n", gid, error);
++ }
+ if (path.needClose) {
+ path.path->close();
+ }
+--- xpdf/SplashFTFont.h.orig 2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFTFont.h 2008-10-04 17:39:57.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);
+
+--- xpdf/SplashScreen.cc.orig 2008-10-06 17:59:44.000000000 +0200
++++ xpdf/SplashScreen.cc 2008-10-06 18:20:09.000000000 +0200
+@@ -363,6 +363,8 @@
+ int SplashScreen::test(int x, int y, Guchar value) {
+ int xx, yy;
+
++ return 1;
++
+ if (value < minVal) {
+ return 0;
+ }
+--- xpdf/gfile.cc.orig 2007-02-27 23:05:51.000000000 +0100
++++ xpdf/gfile.cc 2008-10-12 15:15:22.000000000 +0200
+@@ -439,6 +439,52 @@
#endif
}
+ // used to be mktemp. This does remove the warnings, but
+ // It's not exactly an improvement.
+#ifdef HAVE_LRAND48
-+ sprintf(ptr, "%s%s%08x%08x",dir,sep,lrand48(),lrand48());
++ sprintf(ptr, "%s%s%08x%08x",dir,sep,(unsigned int)lrand48(),(unsigned int)lrand48());
+#else
+# ifdef HAVE_RAND
+ sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand());
GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) {
#if defined(WIN32)
//---------- Win32 ----------
-@@ -463,7 +509,7 @@
+@@ -460,7 +506,7 @@
+ s->append("x");
+ t = (int)time(NULL);
+ for (i = 0; i < 1000; ++i) {
+- sprintf(buf, "%d", t + i);
++ sprintf(buf, "%08x-%08x", t + i, GetCurrentThreadId());
+ s2 = s->copy()->append(buf);
+ if (ext) {
+ s2->append(ext);
+@@ -468,8 +514,7 @@
+ if (!(f2 = fopen(s2->getCString(), "r"))) {
+ if (!(f2 = fopen(s2->getCString(), mode))) {
+ delete s2;
+- delete s;
+- return gFalse;
++ continue;
+ }
+ *name = s2;
+ *f = f2;
+@@ -479,6 +524,7 @@
+ fclose(f2);
+ delete s2;
+ }
++ fprintf(stderr, "Couldn't create temporary file\n");
+ delete s;
+ return gFalse;
+ #elif defined(VMS) || defined(__EMX__) || defined(ACORN) || defined(MACOS)
+@@ -489,7 +535,7 @@
// with this file name after the tmpnam call and before the fopen
// call. I will happily accept fixes to this function for non-Unix
// OSs.
return gFalse;
}
*name = new GString(s);
-@@ -490,7 +536,7 @@
+@@ -516,7 +562,7 @@
(*name)->append("/XXXXXX")->append(ext);
fd = mkstemps((*name)->getCString(), strlen(ext));
#else
return gFalse;
}
*name = new GString(s);
-@@ -507,7 +553,7 @@
+@@ -533,7 +579,7 @@
(*name)->append("/XXXXXX");
fd = mkstemp((*name)->getCString());
#else // HAVE_MKSTEMP
return gFalse;
}
*name = new GString(s);
-Index: gfile.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -r1.9 -r1.10
---- gfile.h 3 Dec 2005 10:11:33 -0000 1.9
-+++ gfile.h 3 Dec 2005 10:30:41 -0000 1.10
-@@ -58,6 +58,9 @@
- // Get current directory.
- extern GString *getCurrentDir();
-
-+/* create a temporary filename */
-+char* mktmpname(char*ptr);
-+
- // 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);
-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:
-@@ -246,6 +246,10 @@
- GBool loadPlugin(char *type, char *name);
- #endif
+--- xpdf/Gfx.cc.orig 2009-03-08 17:10:40.000000000 +0100
++++ xpdf/Gfx.cc 2009-03-08 17:18:23.000000000 +0100
+@@ -3188,8 +3188,11 @@
+ u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
+ &dx, &dy, &originX, &originY);
+ dx = dx * state->getFontSize() + state->getCharSpace();
+- if (n == 1 && *p == ' ') {
+- dx += state->getWordSpace();
++ if (n == 1 && (*p == ' ' || *p == 0)) {
++ double w=state->getWordSpace();
++ if (w==0 && dx==0)
++ w=state->getFontSize()/3; // workaround for zero word space
++ dx += w;
+ }
+ dx *= state->getHorizScaling();
+ dy *= state->getFontSize();
+@@ -3824,6 +3833,7 @@
+ out->beginTransparencyGroup(state, bbox, blendingColorSpace,
+ isolated, knockout, softMask);
+ }
++ GfxState*old_state = state;
-+ //----- config file base path
-+
-+ GString*path;
-+
- //----- static tables
+ // set new base matrix
+ for (i = 0; i < 6; ++i) {
+@@ -3835,6 +3845,9 @@
+ display(str, gFalse);
- 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 @@
- //----- initialization and control
+ if (softMask || transpGroup) {
++ // restore graphics state
++ while(state != old_state)
++ restoreState();
+ out->endTransparencyGroup(state);
+ }
- // 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);
+--- TextOutputDev.h.orig 2009-10-07 17:00:29.000000000 -0700
++++ TextOutputDev.h 2009-10-07 17:01:50.000000000 -0700
+@@ -170,6 +170,7 @@
+ friend class TextFlow;
+ friend class TextWordList;
+ friend class TextPage;
++ friend class XMLOutputDev;
+ };
- // End a page.
- virtual void endPage();
---- SplashOutputDev.cc.orig 2006-11-12 12:07:06.000000000 +0100
-+++ SplashOutputDev.cc 2006-11-12 12:09:36.000000000 +0100
-@@ -696,7 +696,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];
---- TextOutputDev.h.orig 2006-11-12 12:23:01.000000000 +0100
-+++ TextOutputDev.h 2006-11-12 12:25:31.000000000 +0100
-@@ -578,7 +578,7 @@
+ //------------------------------------------------------------------------
+@@ -578,7 +579,7 @@
//----- initialization and control
// Start a page.
// End a page.
virtual void endPage();
---- TextOutputDev.cc.orig 2006-11-12 12:22:53.000000000 +0100
-+++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100
-@@ -3805,7 +3805,7 @@
+--- xpdf/JBIG2Stream.cc.orig 2010-01-08 17:17:18.000000000 -0800
++++ xpdf/JBIG2Stream.cc 2010-01-21 15:28:26.000000000 -0800
+@@ -1514,11 +1514,14 @@
}
- }
--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);
- }
+ // compute symbol code length
+- symCodeLen = 1;
+- i = (numInputSyms + numNewSyms) >> 1;
+- while (i) {
+- ++symCodeLen;
+- i >>= 1;
++ symCodeLen = 0;
++ i = 1;
++ while (i < numInputSyms + numNewSyms) {
++ ++symCodeLen;
++ i <<= 1;
++ }
++ if (huff && symCodeLen == 0) {
++ symCodeLen = 1;
+ }
---- CoreOutputDev.cc.orig 2006-11-12 12:21:59.000000000 +0100
-+++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100
-@@ -57,5 +57,5 @@
+ // get the input symbol bitmaps
+@@ -1921,6 +1924,9 @@
+ ++symCodeLen;
+ i <<= 1;
+ }
++ if (huff && symCodeLen == 0) {
++ symCodeLen = 1;
++ }
- void CoreOutputDev::clear() {
- startDoc(NULL);
-- startPage(0, NULL);
-+ startPage(0, NULL, 0,0,0,0);
- }
+ // get the symbol bitmaps
+ syms = (JBIG2Bitmap **)gmallocn(numSyms, sizeof(JBIG2Bitmap *));
+--- xpdf/SplashXPathScanner.cc.orig 2010-01-21 16:00:38.000000000 -0800
++++ xpdf/SplashXPathScanner.cc 2010-01-21 16:10:31.000000000 -0800
+@@ -394,10 +394,10 @@
+ *p++ &= mask;
+ xx = (xx & ~7) + 8;
+ }
+- for (; xx + 7 <= xx0; xx += 8) {
++ for (; xx + 7 < xx0; xx += 8) {
+ *p++ = 0x00;
+ }
+- if (xx <= xx0) {
++ if (xx < xx0) {
+ *p &= 0xff >> (xx0 & 7);
+ }
+ }
+@@ -417,10 +417,10 @@
+ *p++ &= mask;
+ xx = (xx & ~7) + 8;
+ }
+- for (; xx + 7 <= xx0; xx += 8) {
++ for (; xx + 7 < xx0; xx += 8) {
+ *p++ = 0x00;
+ }
+- if (xx <= xx0) {
++ if (xx < xx0) {
+ *p &= 0xff >> (xx0 & 7);
+ }
+ }
+--- xpdf/CharCodeToUnicode.cc.orig 2010-01-25 12:43:00.000000000 -0800
++++ xpdf/CharCodeToUnicode.cc 2010-01-28 14:14:53.000000000 -0800
+@@ -208,13 +208,13 @@
+ int nBits) {
+ PSTokenizer *pst;
+ char tok1[256], tok2[256], tok3[256];
+- int nDigits, n1, n2, n3;
++ int maxCode, n1, n2, n3;
+ CharCode i;
+ CharCode code1, code2;
+ GString *name;
+ FILE *f;
+
+- nDigits = nBits / 4;
++ maxCode = (nBits == 8) ? 0xff : (nBits == 16) ? 0xffff : 0xffffffff;
+ pst = new PSTokenizer(getCharFunc, data);
+ pst->getToken(tok1, sizeof(tok1), &n1);
+ while (pst->getToken(tok2, sizeof(tok2), &n2)) {
+@@ -241,9 +241,9 @@
+ error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
+ break;
+ }
+- if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
++ if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' &&
+ tok2[0] == '<' && tok2[n2 - 1] == '>')) {
+- error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
++ error(-1, "Illegal entry in bfchar block in ToUnicode CMap.");
+ continue;
+ }
+ tok1[n1 - 1] = tok2[n2 - 1] = '\0';
+@@ -251,6 +251,9 @@
+ error(-1, "Illegal entry in bfchar block in ToUnicode CMap");
+ continue;
+ }
++ if (code1 > maxCode) {
++ error(-1, "Invalid entry in bfchar block in ToUnicode CMap");
++ }
+ addMapping(code1, tok2 + 1, n2 - 2, 0);
+ }
+ pst->getToken(tok1, sizeof(tok1), &n1);
+@@ -266,8 +269,8 @@
+ error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
+ break;
+ }
+- if (!(n1 == 2 + nDigits && tok1[0] == '<' && tok1[n1 - 1] == '>' &&
+- n2 == 2 + nDigits && tok2[0] == '<' && tok2[n2 - 1] == '>')) {
++ if (!(tok1[0] == '<' && tok1[n1 - 1] == '>' &&
++ tok2[0] == '<' && tok2[n2 - 1] == '>')) {
+ error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
+ continue;
+ }
+@@ -277,6 +280,10 @@
+ error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
+ continue;
+ }
++ if (code1 > maxCode || code2 > maxCode) {
++ error(-1, "Invalid entry in bfrange block in ToUnicode CMap");
++ }
++
+ if (!strcmp(tok3, "[")) {
+ i = 0;
+ while (pst->getToken(tok1, sizeof(tok1), &n1) &&
+--- xpdf/Decrypt.cc.orig 2010-01-28 14:19:51.000000000 -0800
++++ xpdf/Decrypt.cc 2010-02-02 16:04:53.000000000 -0800
+@@ -596,6 +596,7 @@
+ s->bufIdx = 0;
+ if (last) {
+ n = s->buf[15];
++ if(!n || n>16) n=16;
+ for (i = 15; i >= n; --i) {
+ s->buf[i] = s->buf[i-n];
+ }
+--- xpdf/Catalog.cc.orig 2010-02-02 16:17:24.000000000 -0800
++++ xpdf/Catalog.cc 2010-02-02 16:18:48.000000000 -0800
+@@ -193,7 +193,7 @@
+ if (!kids.isArray()) {
+ error(-1, "Kids object (page %d) is wrong type (%s)",
+ start+1, kids.getTypeName());
+- goto err1;
++ return start;
+ }
+ for (i = 0; i < kids.arrayGetLength(); ++i) {
+ kids.arrayGetNF(i, &kidRef);