2 ===================================================================
3 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Gfx.cc,v
4 retrieving revision 1.9
5 retrieving revision 1.10
7 --- Gfx.cc 3 Dec 2005 10:11:33 -0000 1.9
8 +++ Gfx.cc 3 Dec 2005 10:30:41 -0000 1.10
13 - out->startPage(pageNum, state);
15 + out->startPage(pageNum, state, cropBox->x1,cropBox->y1,cropBox->x2,cropBox->y2);
17 + out->startPage(pageNum, state, 0,0,0,0);
19 out->setDefaultCTM(state->getCTM());
20 out->updateAll(state);
21 for (i = 0; i < 6; ++i) {
23 abortCheckCbkData = abortCheckCbkDataA;
29 state->moveTo(cropBox->x1, cropBox->y1);
30 state->lineTo(cropBox->x2, cropBox->y1);
31 state->lineTo(cropBox->x2, cropBox->y2);
41 Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict,
43 ===================================================================
44 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GfxFont.h,v
45 retrieving revision 1.6
46 retrieving revision 1.7
48 --- GfxFont.h 3 Dec 2005 10:11:33 -0000 1.6
49 +++ GfxFont.h 3 Dec 2005 10:30:41 -0000 1.7
51 CharCodeToUnicode *getToUnicode();
53 // Return the character name associated with <code>.
54 - char *getCharName(int code) { return enc[code]; }
55 + char *getCharName(int code) { return code>=256?0:enc[code]; }
57 // Returns true if the PDF font specified an encoding.
58 GBool getHasEncoding() { return hasEncoding; }
60 ===================================================================
61 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GfxState.cc,v
62 retrieving revision 1.10
63 retrieving revision 1.12
65 --- GfxState.cc 3 Dec 2005 10:11:33 -0000 1.10
66 +++ GfxState.cc 3 Dec 2005 12:41:32 -0000 1.12
73 //------------------------------------------------------------------------
76 - 0.11 * color->c[2] + 0.5));
79 +/*void GfxDeviceCMYKColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
80 + unsigned char r,g,b;
81 + float c = color->c[0];
82 + float m = color->c[1];
83 + float y = color->c[2];
84 + float k = color->c[3];
85 + convert_cmyk2rgb(c,m,y,k, &r,&g,&b);
91 void GfxDeviceCMYKColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
92 double c, m, y, k, c1, m1, y1, k1, r, g, b, x;
95 GfxIndexedColorSpace *indexedCS;
96 GfxSeparationColorSpace *sepCS;
97 int maxPixel, indexHigh;
98 + int maxPixelForAlloc;
102 @@ -3111,6 +3125,7 @@
103 // bits per component and color space
105 maxPixel = (1 << bits) - 1;
106 + maxPixelForAlloc = (1 << (bits>8?bits:8));
107 colorSpace = colorSpaceA;
110 @@ -3163,7 +3178,7 @@
111 lookup2 = indexedCS->getLookup();
112 colorSpace2->getDefaultRanges(x, y, indexHigh);
113 for (k = 0; k < nComps2; ++k) {
114 - lookup[k] = (GfxColorComp *)gmallocn(maxPixel + 1,
115 + lookup[k] = (GfxColorComp *)gmallocn(maxPixelForAlloc + 1,
116 sizeof(GfxColorComp));
117 for (i = 0; i <= maxPixel; ++i) {
118 j = (int)(decodeLow[0] + (i * decodeRange[0]) / maxPixel + 0.5);
119 @@ -3182,7 +3197,7 @@
120 nComps2 = colorSpace2->getNComps();
121 sepFunc = sepCS->getFunc();
122 for (k = 0; k < nComps2; ++k) {
123 - lookup[k] = (GfxColorComp *)gmallocn(maxPixel + 1,
124 + lookup[k] = (GfxColorComp *)gmallocn(maxPixelForAlloc + 1,
125 sizeof(GfxColorComp));
126 for (i = 0; i <= maxPixel; ++i) {
127 x[0] = decodeLow[0] + (i * decodeRange[0]) / maxPixel;
128 @@ -3192,7 +3207,7 @@
131 for (k = 0; k < nComps; ++k) {
132 - lookup[k] = (GfxColorComp *)gmallocn(maxPixel + 1,
133 + lookup[k] = (GfxColorComp *)gmallocn(maxPixelForAlloc + 1,
134 sizeof(GfxColorComp));
135 for (i = 0; i <= maxPixel; ++i) {
136 lookup[k][i] = dblToCol(decodeLow[k] +
137 @@ -3754,7 +3769,10 @@
140 void GfxState::setPath(GfxPath *pathA) {
148 Index: GlobalParams.cc
149 ===================================================================
150 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.cc,v
151 retrieving revision 1.4
152 retrieving revision 1.7
154 --- GlobalParams.cc 3 Dec 2005 10:11:33 -0000 1.4
155 +++ GlobalParams.cc 18 Dec 2005 08:31:22 -0000 1.7
162 + char* cfgFileName = fileName->getCString();
163 + char* pos1 = strrchr(cfgFileName, '/');
164 + char* pos2 = strrchr(cfgFileName, '\\');
165 + char* p = pos1>pos2?pos1:pos2;
166 + int pos = p ? p-cfgFileName : -1;
167 + GString*path = new GString(new GString(cfgFileName), 0, (pos < 0 ? strlen(cfgFileName): pos));
171 + path->append('\\');
174 + path->append('\\');
180 + this->path = new GString();
184 while (getLine(buf, sizeof(buf) - 1, f)) {
186 @@ -1142,6 +1165,42 @@
187 deleteGList(tokens, GString);
190 +static char is_absolute(char*filename)
192 + int l = strlen(filename);
193 + if(filename[0] == '/' || filename[0] == '\\')
195 + if(l>2 && filename[1]==':' && (filename[2]=='\\' || filename[2]=='/'))
200 +static GString* qualify_filename(GString*path, GString*filename)
202 + GString*fullpath = 0;
203 + char*prefix = "/usr/local/share/xpdf/";
205 + if (!is_absolute(filename->getCString())) {
206 + /* relative path */
207 + fullpath = path->copy();
208 + fullpath->append(filename);
209 + } else if (!strncmp(filename->getCString(), prefix, strlen(prefix))) {
210 + /* xpdf default path */
211 + char*s = strchr(filename->getCString()+strlen(prefix), '/');
213 + fullpath = path->copy();
214 + fullpath->append(s+1);
216 + fullpath = filename->copy();
219 + /* absolute path */
220 + fullpath = filename->copy();
222 + //printf("%s -%s-> %s\n", filename->getCString(), path->getCString(), fullpath->getCString());
226 void GlobalParams::parseNameToUnicode(GList *tokens, GString *fileName,
229 @@ -1156,10 +1215,10 @@
230 fileName->getCString(), line);
233 - name = (GString *)tokens->get(1);
234 + name = qualify_filename(this->path, (GString *)tokens->get(1));
235 if (!(f = fopen(name->getCString(), "r"))) {
236 - error(-1, "Couldn't open 'nameToUnicode' file '%s'",
237 - name->getCString());
238 + error(-1, "Couldn't open 'nameToUnicode' file '%s' using path '%s'",
239 + name->getCString(), path->getCString());
243 @@ -705,10 +754,12 @@
245 collection = (GString *)tokens->get(1);
246 name = (GString *)tokens->get(2);
248 if ((old = (GString *)cidToUnicodes->remove(collection))) {
251 - cidToUnicodes->add(collection->copy(), name->copy());
253 + cidToUnicodes->add(collection->copy(), qualify_filename(this->path, name));
256 void GlobalParams::parseUnicodeToUnicode(GList *tokens, GString *fileName,
258 if ((old = (GString *)unicodeToUnicodes->remove(font))) {
261 - unicodeToUnicodes->add(font->copy(), file->copy());
263 + unicodeToUnicodes->add(font->copy(), qualify_filename(this->path, file));
266 void GlobalParams::parseUnicodeMap(GList *tokens, GString *fileName,
268 if ((old = (GString *)unicodeMaps->remove(encodingName))) {
271 - unicodeMaps->add(encodingName->copy(), name->copy());
273 + unicodeMaps->add(encodingName->copy(), qualify_filename(this->path, name));
276 void GlobalParams::parseCMapDir(GList *tokens, GString *fileName, int line) {
277 @@ -760,23 +813,30 @@
279 cMapDirs->add(collection->copy(), list);
281 - list->append(dir->copy());
283 + list->append(qualify_filename(this->path, dir));
286 void GlobalParams::parseToUnicodeDir(GList *tokens, GString *fileName,
290 if (tokens->getLength() != 2) {
291 error(-1, "Bad 'toUnicodeDir' config file command (%s:%d)",
292 fileName->getCString(), line);
295 - toUnicodeDirs->append(((GString *)tokens->get(1))->copy());
297 + dir = (GString *)tokens->get(1);
299 + toUnicodeDirs->append(qualify_filename(this->path, dir));
302 void GlobalParams::parseDisplayFont(GList *tokens, GHash *fontHash,
303 DisplayFontParamKind kind,
304 GString *fileName, int line) {
305 DisplayFontParam *param, *old;
308 if (tokens->getLength() < 2) {
310 @@ -788,13 +848,15 @@
311 if (tokens->getLength() != 3) {
314 - param->t1.fileName = ((GString *)tokens->get(2))->copy();
315 + file = (GString *)tokens->get(2);
316 + param->t1.fileName = qualify_filename(this->path, file);
319 if (tokens->getLength() != 3) {
322 - param->tt.fileName = ((GString *)tokens->get(2))->copy();
323 + file = (GString *)tokens->get(2);
324 + param->tt.fileName = qualify_filename(this->path, file);
329 ===================================================================
330 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Lexer.cc,v
331 retrieving revision 1.4
332 retrieving revision 1.5
334 --- Lexer.cc 3 Dec 2005 10:11:33 -0000 1.4
335 +++ Lexer.cc 14 Mar 2006 12:43:23 -0000 1.5
337 curStr.streamReset();
340 +static int illegalChars = 0;
343 if (!curStr.isNone()) {
349 + error(0, "Illegal characters in hex string (%d)", illegalChars);
353 int Lexer::getChar() {
355 } else if (c2 >= 'a' && c2 <= 'f') {
358 - error(getPos(), "Illegal digit in hex char in name");
360 + //error(getPos(), "Illegal digit in hex char in name");
366 else if (c >= 'a' && c <= 'f')
369 - error(getPos(), "Illegal character <%02x> in hex string", c);
372 + //error(getPos(), "Illegal character <%02x> in hex string", c);
375 if (n == tokBufSize) {
379 obj->initCmd(tokBuf);
381 - error(getPos(), "Illegal character '>'");
383 + //error(getPos(), "Illegal character '>'");
391 - error(getPos(), "Illegal character '%c'", c);
392 + //error(getPos(), "Illegal character '%c'", c);
406 ===================================================================
407 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Link.cc,v
408 retrieving revision 1.5
409 retrieving revision 1.6
411 --- Link.cc 3 Dec 2005 10:11:33 -0000 1.5
412 +++ Link.cc 26 Mar 2006 08:26:59 -0000 1.6
420 - error(-1, "Illegal annotation destination");
421 + error(-1, "Illegal annotation destination %d", destObj->getType());
432 - error(-1, "Illegal annotation destination");
433 + error(-1, "Illegal annotation destination %d", destObj->getType());
438 ===================================================================
439 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/OutputDev.h,v
440 retrieving revision 1.7
441 retrieving revision 1.9
443 --- OutputDev.h 3 Dec 2005 10:11:33 -0000 1.7
444 +++ OutputDev.h 3 Dec 2005 10:31:47 -0000 1.9
446 virtual void setDefaultCTM(double *ctm);
449 - virtual void startPage(int pageNum, GfxState *state) {}
450 + virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {}
453 virtual void endPage() {}
455 ===================================================================
456 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Stream.cc,v
457 retrieving revision 1.7
458 retrieving revision 1.8
460 --- Stream.cc 3 Dec 2005 10:11:33 -0000 1.7
461 +++ Stream.cc 3 Dec 2005 10:30:41 -0000 1.8
467 +extern "C" int unlink(char *filename);
472 ===================================================================
473 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/gfile.h,v
474 retrieving revision 1.9
475 retrieving revision 1.10
477 --- gfile.h 3 Dec 2005 10:11:33 -0000 1.9
478 +++ gfile.h 3 Dec 2005 10:30:41 -0000 1.10
480 // Get current directory.
481 extern GString *getCurrentDir();
483 +/* create a temporary filename */
484 +char* mktmpname(char*ptr);
486 // Append a file name to a path string. <path> may be an empty
487 // string, denoting the current directory). Returns <path>.
488 extern GString *appendToPath(GString *path, char *fileName);
489 Index: GlobalParams.h
490 ===================================================================
491 RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/GlobalParams.h,v
492 retrieving revision 1.5
493 retrieving revision 1.6
495 --- GlobalParams.h 2006-10-10 19:54:29.000000000 +0200
496 +++ GlobalParams.h 2006-11-12 11:19:40.000000000 +0100
498 FILE *getUnicodeMapFile(GString *encodingName);
499 FILE *findCMapFile(GString *collection, GString *cMapName);
500 FILE *findToUnicodeFile(GString *name);
501 - DisplayFontParam *getDisplayFont(GString *fontName);
502 - DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
503 + virtual DisplayFontParam *getDisplayFont(GString *fontName);
504 + virtual DisplayFontParam *getDisplayCIDFont(GString *fontName, GString *collection);
505 GString *getPSFile();
506 int getPSPaperWidth();
507 int getPSPaperHeight();
509 - void parseFile(GString *fileName, FILE *f);
510 +public: void parseFile(GString *fileName, FILE *f); private:
512 GBool loadPlugin(char *type, char *name);
515 + //----- config file base path
519 //----- static tables
521 NameToCharCode * // mapping from char name to
522 --- SplashOutputDev.h 2006-11-12 12:07:22.000000000 +0100
523 +++ SplashOutputDev.h 2006-11-12 12:08:48.000000000 +0100
525 //----- initialization and control
528 - virtual void startPage(int pageNum, GfxState *state);
529 + virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
532 virtual void endPage();
533 --- SplashOutputDev.cc 2006-11-12 12:07:06.000000000 +0100
534 +++ SplashOutputDev.cc 2006-11-12 12:09:36.000000000 +0100
539 -void SplashOutputDev::startPage(int pageNum, GfxState *state) {
540 +void SplashOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
544 --- TextOutputDev.cc 2006-11-12 12:22:53.000000000 +0100
545 +++ TextOutputDev.cc 2006-11-12 12:25:03.000000000 +0100
546 @@ -3805,7 +3805,7 @@
550 -void TextOutputDev::startPage(int pageNum, GfxState *state) {
551 +void TextOutputDev::startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2) {
552 text->startPage(state);
555 --- CoreOutputDev.cc 2006-11-12 12:21:59.000000000 +0100
556 +++ CoreOutputDev.cc 2006-11-12 12:23:29.000000000 +0100
559 void CoreOutputDev::clear() {
561 - startPage(0, NULL);
562 + startPage(0, NULL, 0,0,0,0);
564 --- SplashFTFontEngine.cc 2006-11-19 22:30:44.000000000 +0100
565 +++ SplashFTFontEngine.cc 2006-11-19 22:30:56.000000000 +0100
576 --- SplashOutputDev.cc 2007-09-09 12:29:45.000000000 +0200
577 +++ SplashOutputDev.cc 2007-09-09 12:30:02.000000000 +0200
585 #include "GlobalParams.h"
586 --- SplashFontFile.cc 2007-09-09 12:33:00.000000000 +0200
587 +++ SplashFontFile.cc 2007-09-09 12:33:07.000000000 +0200
593 -# include <unistd.h>
597 #include "SplashFontFile.h"
598 #include "SplashFontFileID.h"
599 --- xpdf/SplashFont.h.orig 2008-09-09 21:31:01.000000000 +0200
600 +++ xpdf/SplashFont.h 2008-10-05 17:36:44.000000000 +0200
602 virtual GBool makeGlyph(int c, int xFrac, int yFrac,
603 SplashGlyphBitmap *bitmap) = 0;
605 + // return the number of characters in this font
606 + virtual int getNumChars() = 0;
608 // Return the path for a glyph.
609 virtual SplashPath *getGlyphPath(int c) = 0;
612 void getBBox(int *xMinA, int *yMinA, int *xMaxA, int *yMaxA)
613 { *xMinA = xMin; *yMinA = yMin; *xMaxA = xMax; *yMaxA = yMax; }
617 + double last_advance; //set after getGlyphPath()
620 SplashFontFile *fontFile;
621 --- orig/GfxFont.h 2007-07-28 00:11:06.000000000 +0200
622 +++ GfxFont.h 2007-09-09 18:31:31.000000000 +0200
624 virtual int getNextChar(char *s, int len, CharCode *code,
625 Unicode *u, int uSize, int *uLen,
626 double *dx, double *dy, double *ox, double *oy) = 0;
627 + virtual CharCodeToUnicode* getCTU() = 0;
632 virtual int getNextChar(char *s, int len, CharCode *code,
633 Unicode *u, int uSize, int *uLen,
634 double *dx, double *dy, double *ox, double *oy);
635 + virtual CharCodeToUnicode* getCTU();
637 // Return the encoding.
638 char **getEncoding() { return enc; }
640 virtual int getNextChar(char *s, int len, CharCode *code,
641 Unicode *u, int uSize, int *uLen,
642 double *dx, double *dy, double *ox, double *oy);
643 + virtual CharCodeToUnicode* getCTU();
645 // Return the writing mode (0=horizontal, 1=vertical).
646 virtual int getWMode();
647 --- orig/GfxFont.cc 2007-07-28 00:11:06.000000000 +0200
648 +++ GfxFont.cc 2007-09-09 18:33:37.000000000 +0200
653 +CharCodeToUnicode* Gfx8BitFont::getCTU() {
657 CharCodeToUnicode *Gfx8BitFont::getToUnicode() {
660 @@ -1417,6 +1421,10 @@
664 +CharCodeToUnicode* GfxCIDFont::getCTU() {
668 int GfxCIDFont::getNextChar(char *s, int len, CharCode *code,
669 Unicode *u, int uSize, int *uLen,
670 double *dx, double *dy, double *ox, double *oy) {
671 --- OutputDev.h Sat Jul 28 00:11:08 2007
672 +++ OutputDev.h Sun Sep 9 13:50:40 2007
676 #include "CharTypes.h"
681 --- SplashOutputDev.h 2007-10-20 13:17:02.000000000 +0200
682 +++ SplashOutputDev.h 2007-10-20 13:17:23.000000000 +0200
684 virtual void setVectorAntialias(GBool vaa);
687 + void doUpdateFont(GfxState *state);
690 void setupScreenParams(double hDPI, double vDPI);
692 SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
694 SplashPath *convertPath(GfxState *state, GfxPath *path);
695 - void doUpdateFont(GfxState *state);
696 void drawType3Glyph(T3FontCache *t3Font,
697 T3FontCacheTag *tag, Guchar *data);
698 static GBool imageMaskSrc(void *data, SplashColorPtr line);
699 --- xpdf/GlobalParams.h 2007-10-20 13:18:03.000000000 +0200
700 +++ xpdf/GlobalParams.h 2007-10-20 13:25:52.000000000 +0200
703 GlobalParams(char *cfgFileName);
706 + virtual ~GlobalParams();
708 void setBaseDir(char *dir);
709 void setupBaseFonts(char *dir);
710 --- xpdf/SplashOutputDev.h.orig 2007-10-21 17:43:29.000000000 +0200
711 +++ xpdf/SplashOutputDev.h 2007-11-19 10:07:27.000000000 +0100
715 void doUpdateFont(GfxState *state);
717 + SplashPath *convertPath(GfxState *state, GfxPath *path);
720 void setupScreenParams(double hDPI, double vDPI);
723 SplashPattern *getColor(GfxGray gray, GfxRGB *rgb);
725 - SplashPath *convertPath(GfxState *state, GfxPath *path);
726 void drawType3Glyph(T3FontCache *t3Font,
727 T3FontCacheTag *tag, Guchar *data);
728 static GBool imageMaskSrc(void *data, SplashColorPtr line);
729 --- xpdf/SplashFont.cc.orig 2008-09-09 21:31:01.000000000 +0200
730 +++ xpdf/SplashFont.cc 2008-10-05 17:37:08.000000000 +0200
734 xMin = yMin = xMax = yMax = 0;
741 void SplashFont::initCache() {
742 --- xpdf/SplashFTFont.cc.orig 2009-03-08 17:19:08.000000000 +0100
743 +++ xpdf/SplashFTFont.cc 2009-03-15 19:18:11.000000000 +0100
747 face = fontFileA->face;
749 if (FT_New_Size(face, &sizeObj)) {
753 if (FT_Set_Pixel_Sizes(face, 0, (int)size)) {
757 + this->ascender = face->ascender;
758 + this->descender = face->descender;
760 // if the textMat values are too small, FreeType's fixed point
761 // arithmetic doesn't work so well
762 textScale = splashSqrt(textMat[2]*textMat[2] + textMat[3]*textMat[3]) / size;
767 +int SplashFTFont::getNumChars()
769 + SplashFTFontFile* ff = (SplashFTFontFile *)fontFile;
770 + return ff->face->num_glyphs;
773 SplashPath *SplashFTFont::getGlyphPath(int c) {
774 static FT_Outline_Funcs outlineFuncs = {
775 #if FREETYPE_MINOR <= 1
780 + this->last_advance = -1;
782 ff = (SplashFTFontFile *)fontFile;
783 ff->face->size = sizeObj;
784 FT_Set_Transform(ff->face, &textMatrix, NULL);
785 @@ -262,17 +275,24 @@
786 // skip the TrueType notdef glyph
789 - if (FT_Load_Glyph(ff->face, gid, FT_LOAD_NO_BITMAP)) {
791 + if ((error=FT_Load_Glyph(ff->face, gid, FT_LOAD_NO_BITMAP|FT_LOAD_NO_HINTING))) {
792 + fprintf(stderr, "Truetype wasn't able to load glyph %d, error %d\n", gid, error);
795 if (FT_Get_Glyph(slot, &glyph)) {
798 + this->last_advance = glyph->advance.x/65536.0;
800 path.path = new SplashPath();
801 path.textScale = textScale;
802 path.needClose = gFalse;
803 - FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline,
804 + error = FT_Outline_Decompose(&((FT_OutlineGlyph)glyph)->outline,
805 &outlineFuncs, &path);
807 + fprintf(stderr, "Truetype wasn't able to read glyph %d, error %d\n", gid, error);
809 if (path.needClose) {
812 --- xpdf/SplashFTFont.h.orig 2008-09-09 21:31:01.000000000 +0200
813 +++ xpdf/SplashFTFont.h 2008-10-04 17:39:57.000000000 +0200
815 virtual GBool makeGlyph(int c, int xFrac, int yFrac,
816 SplashGlyphBitmap *bitmap);
818 + // return the number of characters in this font
819 + virtual int getNumChars();
821 // Return the path for a glyph.
822 virtual SplashPath *getGlyphPath(int c);
824 --- xpdf/SplashScreen.cc.orig 2008-10-06 17:59:44.000000000 +0200
825 +++ xpdf/SplashScreen.cc 2008-10-06 18:20:09.000000000 +0200
827 int SplashScreen::test(int x, int y, Guchar value) {
832 if (value < minVal) {
835 --- xpdf/gfile.cc.orig 2007-02-27 23:05:51.000000000 +0100
836 +++ xpdf/gfile.cc 2008-10-12 15:15:22.000000000 +0200
841 +static char* getTempDir()
844 + char*dir = getenv("TMP");
845 + if(!dir) dir = getenv("TEMP");
846 + if(!dir) dir = getenv("tmp");
847 + if(!dir) dir = getenv("temp");
848 + if(!dir) dir = "C:\\";
850 + char* dir = "/tmp/";
855 +char* mktmpname(char*ptr) {
856 + static char tmpbuf[128];
857 + char*dir = getTempDir();
858 + int l = strlen(dir);
862 + if(l && dir[l-1]!='/' && dir[l-1]!='\\') {
870 + // used to be mktemp. This does remove the warnings, but
871 + // It's not exactly an improvement.
873 + sprintf(ptr, "%s%s%08x%08x",dir,sep,(unsigned int)lrand48(),(unsigned int)lrand48());
876 + sprintf(ptr, "%s%s%08x%08x",dir,sep,rand(),rand());
878 + static int count = 1;
879 + sprintf(ptr, "%s%s%08x%04x%04x",dir,sep,time(0),(unsigned int)tmpbuf^((unsigned int)tmpbuf)>>16,count);
887 GBool openTempFile(GString **name, FILE **f, char *mode, char *ext) {
889 //---------- Win32 ----------
893 for (i = 0; i < 1000; ++i) {
894 - sprintf(buf, "%d", t + i);
895 + sprintf(buf, "%08x-%08x", t + i, GetCurrentThreadId());
896 s2 = s->copy()->append(buf);
900 if (!(f2 = fopen(s2->getCString(), "r"))) {
901 if (!(f2 = fopen(s2->getCString(), mode))) {
913 + fprintf(stderr, "Couldn't create temporary file\n");
916 #elif defined(VMS) || defined(__EMX__) || defined(ACORN) || defined(MACOS)
918 // with this file name after the tmpnam call and before the fopen
919 // call. I will happily accept fixes to this function for non-Unix
921 - if (!(s = tmpnam(NULL))) {
922 + if (!(s = mktmpname(NULL))) {
925 *name = new GString(s);
927 (*name)->append("/XXXXXX")->append(ext);
928 fd = mkstemps((*name)->getCString(), strlen(ext));
930 - if (!(s = tmpnam(NULL))) {
931 + if (!(s = mktmpname(NULL))) {
934 *name = new GString(s);
936 (*name)->append("/XXXXXX");
937 fd = mkstemp((*name)->getCString());
938 #else // HAVE_MKSTEMP
939 - if (!(s = tmpnam(NULL))) {
940 + if (!(s = mktmpname(NULL))) {
943 *name = new GString(s);
944 --- xpdf/Gfx.cc.orig 2009-03-08 17:10:40.000000000 +0100
945 +++ xpdf/Gfx.cc 2009-03-08 17:18:23.000000000 +0100
946 @@ -3188,8 +3188,11 @@
947 u, (int)(sizeof(u) / sizeof(Unicode)), &uLen,
948 &dx, &dy, &originX, &originY);
949 dx = dx * state->getFontSize() + state->getCharSpace();
950 - if (n == 1 && *p == ' ') {
951 - dx += state->getWordSpace();
952 + if (n == 1 && (*p == ' ' || *p == 0)) {
953 + double w=state->getWordSpace();
955 + w=state->getFontSize()/3; // workaround for zero word space
958 dx *= state->getHorizScaling();
959 dy *= state->getFontSize();
960 @@ -3824,6 +3833,7 @@
961 out->beginTransparencyGroup(state, bbox, blendingColorSpace,
962 isolated, knockout, softMask);
964 + GfxState*old_state = state;
966 // set new base matrix
967 for (i = 0; i < 6; ++i) {
968 @@ -3835,6 +3845,9 @@
969 display(str, gFalse);
971 if (softMask || transpGroup) {
972 + // restore graphics state
973 + while(state != old_state)
975 out->endTransparencyGroup(state);
978 --- TextOutputDev.h.orig 2009-10-07 17:00:29.000000000 -0700
979 +++ TextOutputDev.h 2009-10-07 17:01:50.000000000 -0700
981 friend class TextFlow;
982 friend class TextWordList;
983 friend class TextPage;
984 + friend class XMLOutputDev;
987 //------------------------------------------------------------------------
989 //----- initialization and control
992 - virtual void startPage(int pageNum, GfxState *state);
993 + virtual void startPage(int pageNum, GfxState *state, double x1,double y1,double x2,double y2);
996 virtual void endPage();
997 --- xpdf/JBIG2Stream.cc.orig 2010-01-08 17:17:18.000000000 -0800
998 +++ xpdf/JBIG2Stream.cc 2010-01-21 15:28:26.000000000 -0800
999 @@ -1514,11 +1514,14 @@
1002 // compute symbol code length
1004 - i = (numInputSyms + numNewSyms) >> 1;
1010 + while (i < numInputSyms + numNewSyms) {
1014 + if (huff && symCodeLen == 0) {
1018 // get the input symbol bitmaps
1019 @@ -1921,6 +1924,9 @@
1023 + if (huff && symCodeLen == 0) {
1027 // get the symbol bitmaps
1028 syms = (JBIG2Bitmap **)gmallocn(numSyms, sizeof(JBIG2Bitmap *));