From: Matthias Kramm Date: Thu, 6 May 2010 00:11:20 +0000 (-0700) Subject: fixed font bug X-Git-Tag: version-0-9-1~36 X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=fc713269e9d26d1be92f70e1ff0d508c94a65dba fixed font bug --- diff --git a/lib/gfxfont.c b/lib/gfxfont.c index fa75059..e6f96cb 100644 --- a/lib/gfxfont.c +++ b/lib/gfxfont.c @@ -143,7 +143,7 @@ static int errorno = 0; //#define DEBUG 1 -gfxfont_t* gfxfont_load(char*id, char*filename, unsigned int flags, double quality) +gfxfont_t* gfxfont_load(const char*id, const char*filename, unsigned int flags, double quality) { FT_Face face; FT_Error error; diff --git a/lib/gfxfont.h b/lib/gfxfont.h index a553ea4..0c18a56 100644 --- a/lib/gfxfont.h +++ b/lib/gfxfont.h @@ -32,7 +32,7 @@ extern "C" { /* The quality parameter is given by 1 divided by the zoom factor at which the font still looks good. 1=normal, 0.5=double resolution etc. */ -gfxfont_t* gfxfont_load(char*id, char*filename, unsigned int flags, double quality); +gfxfont_t* gfxfont_load(const char*id, const char*filename, unsigned int flags, double quality); void gfxfont_save(gfxfont_t*font, const char*filename); void gfxfont_save_eot(gfxfont_t*font, const char*filename); void gfxfont_fix_unicode(gfxfont_t*font); diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc index 83dd43f..8fb751a 100644 --- a/lib/pdf/InfoOutputDev.cc +++ b/lib/pdf/InfoOutputDev.cc @@ -544,6 +544,16 @@ void InfoOutputDev::endType3Char(GfxState *state) currentglyph->path->lineTo(x1,y2); currentglyph->path->close(); } + +void InfoOutputDev::saveState(GfxState *state) +{ + updateAll(state); +} + +void InfoOutputDev::restoreState(GfxState *state) +{ + updateAll(state); +} void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h index 66958da..4198b7d 100644 --- a/lib/pdf/InfoOutputDev.h +++ b/lib/pdf/InfoOutputDev.h @@ -122,6 +122,9 @@ class InfoOutputDev: public OutputDev virtual void drawLink(Link *link, Catalog *catalog); virtual double getMaximumFontSize(char*id); virtual void updateFont(GfxState *state); + + virtual void saveState(GfxState *state); + virtual void restoreState(GfxState *state); virtual GBool beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen); virtual void type3D0(GfxState *state, double wx, double wy);