-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);
// 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
#include <string.h>
#include <ctype.h>
Index: config.h
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/config.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 @@
+--- config.h.orig 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) && !defined(__CYGWIN32__))
+ #if defined(VMS) || defined(WIN32)
-#define xpdfUserConfigFile "xpdfrc"
+#define xpdfUserConfigFile "pdf2swf.conf"
#else
#endif
// system config file name (set via the configure script)
--#ifdef SYSTEM_XPDFRC
--#define xpdfSysConfigFile SYSTEM_XPDFRC
-+#ifndef WIN32
-+#define xpdfSysConfigFile "/etc/pdf2swf.conf"
+@@ -64,7 +64,7 @@
#else
// under Windows, we get the directory with the executable and then
// append this file name
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:
- 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.orig 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.orig 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"
+--- SplashFont.orig.h 2007-09-09 14:23:47.000000000 +0200
++++ SplashFont.h 2007-09-09 14:24:28.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;
+
+--- SplashFTFont.orig.h 2007-09-09 14:23:47.000000000 +0200
++++ SplashFTFont.h 2007-09-09 14:25:19.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);
+
+--- SplashFTFont.cc.orig.h 2007-09-09 14:23:50.000000000 +0200
++++ SplashFTFont.cc 2007-09-09 14:27:35.000000000 +0200
+@@ -228,6 +228,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
+--- 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.orig 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;
git.asbjorn.biz / swftools.git / blobdiff