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);
#include <string.h>
#include <ctype.h>
Index: config.h
---- config.h.orig 2007-09-09 12:11:20.000000000 +0200
+--- config.h 2007-09-09 12:11:20.000000000 +0200
+++ config.h 2007-09-09 12:11:40.000000000 +0200
@@ -53,9 +53,9 @@
// user config file name, relative to the user's home directory
- #if defined(VMS) || defined(WIN32)
+ #if defined(VMS) || (defined(WIN32) && !defined(__CYGWIN32__))
-#define xpdfUserConfigFile "xpdfrc"
+#define xpdfUserConfigFile "pdf2swf.conf"
#else
#endif
//------------------------------------------------------------------------
-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 @@
- #endif
- }
-
-+static char* getTempDir()
-+{
-+#ifdef WIN32
-+ char*dir = getenv("TMP");
-+ if(!dir) dir = getenv("TEMP");
-+ if(!dir) dir = getenv("tmp");
-+ if(!dir) dir = getenv("temp");
-+ if(!dir) dir = "C:\\";
-+#else
-+ char* dir = "/tmp/";
-+#endif
-+ return dir;
-+}
-+
-+char* mktmpname(char*ptr) {
-+ static char tmpbuf[128];
-+ char*dir = getTempDir();
-+ int l = strlen(dir);
-+ char*sep = "";
-+ if(!ptr)
-+ ptr = tmpbuf;
-+ if(l && dir[l-1]!='/' && dir[l-1]!='\\') {
-+#ifdef WIN32
-+ sep = "\\";
-+#else
-+ sep = "/";
-+#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());
-+#else
-+# ifdef HAVE_RAND
-+ sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand());
-+# else
-+ static int count = 1;
-+ sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count);
-+ count ++;
-+# endif
-+#endif
-+ return ptr;
-+}
-+
-+
- GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) {
- #if defined(WIN32)
- //---------- Win32 ----------
-@@ -463,7 +509,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.
-- if (!(s = tmpnam(NULL))) {
-+ if (!(s = mktmpname(NULL))) {
- return gFalse;
- }
- *name = new GString(s);
-@@ -490,7 +536,7 @@
- (*name)->append("/XXXXXX")->append(ext);
- fd = mkstemps((*name)->getCString(), strlen(ext));
- #else
-- if (!(s = tmpnam(NULL))) {
-+ if (!(s = mktmpname(NULL))) {
- return gFalse;
- }
- *name = new GString(s);
-@@ -507,7 +553,7 @@
- (*name)->append("/XXXXXX");
- fd = mkstemp((*name)->getCString());
- #else // HAVE_MKSTEMP
-- if (!(s = tmpnam(NULL))) {
-+ if (!(s = mktmpname(NULL))) {
- return gFalse;
- }
- *name = new GString(s);
Index: gfile.h
===================================================================
RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v
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
+@@ -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:
//----- 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:07:22.000000000 +0100
+++ SplashOutputDev.h 2006-11-12 12:08:48.000000000 +0100
@@ -70,7 +70,7 @@
//----- initialization and control
// End a page.
virtual void endPage();
---- SplashOutputDev.cc.orig 2006-11-12 12:07:06.000000000 +0100
+--- SplashOutputDev.cc 2006-11-12 12:07:06.000000000 +0100
+++ SplashOutputDev.cc 2006-11-12 12:09:36.000000000 +0100
@@ -696,7 +696,7 @@
nT3Fonts = 0;
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:23:01.000000000 +0100
+++ TextOutputDev.h 2006-11-12 12:25:31.000000000 +0100
@@ -578,7 +578,7 @@
//----- initialization and control
// End a page.
virtual void endPage();
---- TextOutputDev.cc.orig 2006-11-12 12:22:53.000000000 +0100
+--- TextOutputDev.cc 2006-11-12 12:22:53.000000000 +0100
+++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100
@@ -3805,7 +3805,7 @@
}
text->startPage(state);
}
---- CoreOutputDev.cc.orig 2006-11-12 12:21:59.000000000 +0100
+--- CoreOutputDev.cc 2006-11-12 12:21:59.000000000 +0100
+++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100
@@ -57,5 +57,5 @@
#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"
+--- 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
+
+ #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
+ 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;
+
+ xMin = yMin = xMax = yMax = 0;
++
++ last_advance = -1;
++ ascender = -1;
++ descender = -1;
+ }
+
+ void SplashFont::initCache() {
+--- xpdf/SplashFTFont.cc.orig 2008-09-09 21:31:01.000000000 +0200
++++ xpdf/SplashFTFont.cc 2008-10-05 17:37:32.000000000 +0200
+@@ -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);
+@@ -268,6 +281,8 @@
+ 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;
+--- 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
+ }
+
++static char* getTempDir()
++{
++#ifdef WIN32
++ char*dir = getenv("TMP");
++ if(!dir) dir = getenv("TEMP");
++ if(!dir) dir = getenv("tmp");
++ if(!dir) dir = getenv("temp");
++ if(!dir) dir = "C:\\";
++#else
++ char* dir = "/tmp/";
++#endif
++ return dir;
++}
++
++char* mktmpname(char*ptr) {
++ static char tmpbuf[128];
++ char*dir = getTempDir();
++ int l = strlen(dir);
++ char*sep = "";
++ if(!ptr)
++ ptr = tmpbuf;
++ if(l && dir[l-1]!='/' && dir[l-1]!='\\') {
++#ifdef WIN32
++ sep = "\\";
++#else
++ sep = "/";
++#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());
++#else
++# ifdef HAVE_RAND
++ sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand());
++# else
++ static int count = 1;
++ sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count);
++ count ++;
++# endif
++#endif
++ return ptr;
++}
++
++
+ GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) {
+ #if defined(WIN32)
+ //---------- Win32 ----------
+@@ -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.
+- if (!(s = tmpnam(NULL))) {
++ if (!(s = mktmpname(NULL))) {
+ return gFalse;
+ }
+ *name = new GString(s);
+@@ -516,7 +562,7 @@
+ (*name)->append("/XXXXXX")->append(ext);
+ fd = mkstemps((*name)->getCString(), strlen(ext));
+ #else
+- if (!(s = tmpnam(NULL))) {
++ if (!(s = mktmpname(NULL))) {
+ return gFalse;
+ }
+ *name = new GString(s);
+@@ -533,7 +579,7 @@
+ (*name)->append("/XXXXXX");
+ fd = mkstemp((*name)->getCString());
+ #else // HAVE_MKSTEMP
+- if (!(s = tmpnam(NULL))) {
++ if (!(s = mktmpname(NULL))) {
+ return gFalse;
+ }
+ *name = new GString(s);