#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <stddef.h>
#include <string.h>
#include <unistd.h>
#include "../gfxdevice.h"
#include "../gfxtools.h"
#include "../gfxfont.h"
+#include "../devices/record.h"
+#include "../devices/ops.h"
+#include "../devices/arts.h"
+#include "../devices/render.h"
+
+#include "../art/libart.h"
+#include "../devices/artsutils.c"
+
+#include "../png.h"
+#include "fonts.h"
#include <math.h>
typedef struct _fontfile
{
- char*filename;
+ const char*filename;
int used;
} fontfile_t;
static char* lastfontdir = 0;
-struct mapping {
- char*pdffont;
- char*filename;
+struct fontentry {
+ const char*pdffont;
+ const char*filename;
+ char*afm;
+ int afmlen;
+ char*pfb;
+ int pfblen;
+ char*fullfilename;
} pdf2t1map[] ={
-{"Times-Roman", "n021003l"},
-{"Times-Italic", "n021023l"},
-{"Times-Bold", "n021004l"},
-{"Times-BoldItalic", "n021024l"},
-{"Helvetica", "n019003l"},
-{"Helvetica-Oblique", "n019023l"},
-{"Helvetica-Bold", "n019004l"},
-{"Helvetica-BoldOblique", "n019024l"},
-{"Courier", "n022003l"},
-{"Courier-Oblique", "n022023l"},
-{"Courier-Bold", "n022004l"},
-{"Courier-BoldOblique", "n022024l"},
-{"Symbol", "s050000l"},
-{"ZapfDingbats", "d050000l"}};
+{"Times-Roman", "n021003l", n021003l_afm, n021003l_afm_len, n021003l_pfb, n021003l_pfb_len},
+{"Times-Italic", "n021023l", n021023l_afm, n021023l_afm_len, n021023l_pfb, n021023l_pfb_len},
+{"Times-Bold", "n021004l", n021004l_afm, n021004l_afm_len, n021004l_pfb, n021004l_pfb_len},
+{"Times-BoldItalic", "n021024l", n021024l_afm, n021024l_afm_len, n021024l_pfb, n021024l_pfb_len},
+{"Helvetica", "n019003l", n019003l_afm, n019003l_afm_len, n019003l_pfb, n019003l_pfb_len},
+{"Helvetica-Oblique", "n019023l", n019023l_afm, n019023l_afm_len, n019023l_pfb, n019023l_pfb_len},
+{"Helvetica-Bold", "n019004l", n019004l_afm, n019004l_afm_len, n019004l_pfb, n019004l_pfb_len},
+{"Helvetica-BoldOblique", "n019024l", n019024l_afm, n019024l_afm_len, n019024l_pfb, n019024l_pfb_len},
+{"Courier", "n022003l", n022003l_afm, n022003l_afm_len, n022003l_pfb, n022003l_pfb_len},
+{"Courier-Oblique", "n022023l", n022023l_afm, n022023l_afm_len, n022023l_pfb, n022023l_pfb_len},
+{"Courier-Bold", "n022004l", n022004l_afm, n022004l_afm_len, n022004l_pfb, n022004l_pfb_len},
+{"Courier-BoldOblique", "n022024l", n022024l_afm, n022024l_afm_len, n022024l_pfb, n022024l_pfb_len},
+{"Symbol", "s050000l", s050000l_afm, s050000l_afm_len, s050000l_pfb, s050000l_pfb_len},
+{"ZapfDingbats", "d050000l", d050000l_afm, d050000l_afm_len, d050000l_pfb, d050000l_pfb_len}};
+
+
+static int verbose = 0;
+static int dbgindent = 0;
+static void dbg(const char*format, ...)
+{
+ char buf[1024];
+ int l;
+ va_list arglist;
+ if(!verbose)
+ return;
+ va_start(arglist, format);
+ vsprintf(buf, format, arglist);
+ va_end(arglist);
+ l = strlen(buf);
+ while(l && buf[l-1]=='\n') {
+ buf[l-1] = 0;
+ l--;
+ }
+ printf("(pdf) ");
+ int indent = dbgindent;
+ while(indent) {
+ printf(" ");
+ indent--;
+ }
+ printf("%s\n", buf);
+ fflush(stdout);
+}
+
typedef struct _feature
{
} feature_t;
feature_t*featurewarnings = 0;
-static void warnfeature(char*feature,char fully)
+void GFXOutputDev::showfeature(const char*feature,char fully, char warn)
{
feature_t*f = featurewarnings;
while(f) {
f->string = strdup(feature);
f->next = featurewarnings;
featurewarnings = f;
- msg("<warning> %s not yet %ssupported!",feature,fully?"fully ":"");
+ if(warn) {
+ msg("<warning> %s not yet %ssupported!",feature,fully?"fully ":"");
+ if(this->config_break_on_warning) {
+ msg("<fatal> Aborting conversion due to unsupported feature");
+ exit(1);
+ }
+ } else {
+ msg("<notice> File contains %s",feature);
+ }
+}
+void GFXOutputDev::warnfeature(const char*feature,char fully)
+{
+ showfeature(feature,fully,1);
+}
+void GFXOutputDev::infofeature(const char*feature)
+{
+ showfeature(feature,0,0);
}
GFXOutputState::GFXOutputState() {
this->clipping = 0;
- this->textRender = 0;
this->createsoftmask = 0;
this->transparencygroup = 0;
+ this->softmask = 0;
+ this->grouprecording = 0;
+ this->isolated = 0;
}
GBool GFXOutputDev::interpretType3Chars()
{
- return gTrue;
+ return this->do_interpretType3Chars;
}
typedef struct _drawnchar
chars[num_chars].charid = charid;
}
};
+
+char* writeOutStdFont(fontentry* f)
+{
+ FILE*fi;
+ char namebuf1[512];
+ char namebuf2[512];
+ char* tmpFileName = mktmpname(namebuf1);
+
+ sprintf(namebuf2, "%s.afm", tmpFileName);
+ fi = fopen(namebuf2, "wb");
+ if(!fi)
+ return 0;
+ fwrite(f->afm, 1, f->afmlen, fi);
+ fclose(fi);
+
+ sprintf(namebuf2, "%s.pfb", tmpFileName);
+ fi = fopen(namebuf2, "wb");
+ if(!fi)
+ return 0;
+ fwrite(f->pfb, 1, f->pfblen, fi);
+ fclose(fi);
+ return strdup(namebuf2);
+}
+void unlinkfont(char* filename)
+{
+ int l;
+ if(!filename)
+ return;
+ msg("<verbose> Removing temporary font file %s", filename);
+ l=strlen(filename);
+ unlink(filename);
+ if(!strncmp(&filename[l-4],".afm",4)) {
+ memcpy(&filename[l-4],".pfb",4); unlink(filename);
+ memcpy(&filename[l-4],".pfa",4); unlink(filename);
+ memcpy(&filename[l-4],".afm",4);
+ return;
+ } else
+ if(!strncmp(&filename[l-4],".pfa",4)) {
+ memcpy(&filename[l-4],".afm",4); unlink(filename);
+ memcpy(&filename[l-4],".pfa",4);
+ return;
+ } else
+ if(!strncmp(&filename[l-4],".pfb",4)) {
+ memcpy(&filename[l-4],".afm",4); unlink(filename);
+ memcpy(&filename[l-4],".pfb",4);
+ return;
+ }
+}
+
+
+GFXGlobalParams::GFXGlobalParams()
+: GlobalParams("")
+{
+ //setupBaseFonts(char *dir); //not tested yet
+}
+GFXGlobalParams::~GFXGlobalParams()
+{
+ msg("<verbose> Performing cleanups");
+ int t;
+ for(t=0;t<sizeof(pdf2t1map)/sizeof(fontentry);t++) {
+ if(pdf2t1map[t].fullfilename) {
+ unlinkfont(pdf2t1map[t].fullfilename);
+ }
+ }
+}
+DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
+{
+ msg("<verbose> looking for font %s in global params\n", fontName->getCString());
-static char*getFontID(GfxFont*font);
+ char*name = fontName->getCString();
+ /* see if it is a pdf standard font */
+ int t;
+ for(t=0;t<sizeof(pdf2t1map)/sizeof(fontentry);t++) {
+ if(!strcmp(name, pdf2t1map[t].pdffont)) {
+ if(!pdf2t1map[t].fullfilename) {
+ pdf2t1map[t].fullfilename = writeOutStdFont(&pdf2t1map[t]);
+ if(!pdf2t1map[t].fullfilename) {
+ msg("<error> Couldn't save default font- is the Temp Directory writable?");
+ } else {
+ msg("<verbose> Storing standard PDF font %s at %s", name, pdf2t1map[t].fullfilename);
+ }
+ }
+ DisplayFontParam *dfp = new DisplayFontParam(new GString(fontName), displayFontT1);
+ dfp->t1.fileName = new GString(pdf2t1map[t].fullfilename);
+ return dfp;
+ }
+ }
+ return GlobalParams::getDisplayFont(fontName);
+}
GFXOutputDev::GFXOutputDev(parameter_t*p)
{
this->jpeginfo = 0;
this->textmodeinfo = 0;
- this->ttfinfo = 0;
this->linkinfo = 0;
this->pbminfo = 0;
this->type3active = 0;
this->user_clipy2 = 0;
this->current_text_stroke = 0;
this->current_text_clip = 0;
- this->fontlist = 0;
this->outer_clip_box = 0;
this->pages = 0;
this->pagebuflen = 0;
this->pagepos = 0;
-
- this->forceType0Fonts=1;
this->config_use_fontconfig=1;
+ this->config_break_on_warning=0;
+ this->config_remapunicode=0;
+ this->config_transparent=0;
+ this->do_interpretType3Chars = gTrue;
this->parameters = p;
+
+ this->gfxfontlist = gfxfontlist_create();
+
+ memset(states, 0, sizeof(states));
/* configure device */
while(p) {
- if(!strcmp(p->name,"forceType0Fonts")) {
- this->forceType0Fonts = atoi(p->value);
- } else if(!strcmp(p->name,"fontconfig")) {
- this->config_use_fontconfig = atoi(p->value);
- }
+ setParameter(p->name, p->value);
p = p->next;
}
};
+
+void GFXOutputDev::setParameter(const char*key, const char*value)
+{
+ if(!strcmp(key,"rawtext")) {
+ this->do_interpretType3Chars = atoi(value)^1;
+ } else if(!strcmp(key,"breakonwarning")) {
+ this->config_break_on_warning = atoi(value);
+ } else if(!strcmp(key,"fontconfig")) {
+ this->config_use_fontconfig = atoi(value);
+ } else if(!strcmp(key,"remapunicode")) {
+ this->config_remapunicode = atoi(value);
+ } else if(!strcmp(key,"transparent")) {
+ this->config_transparent = atoi(value);
+ }
+}
void GFXOutputDev::setDevice(gfxdevice_t*dev)
{
parameter_t*p = this->parameters;
- /* TODO: get rid of this */
+ /* pass parameters to output device */
this->device = dev;
if(this->device) {
while(p) {
this->user_clipy2 = y2;
}
-static char*getFontID(GfxFont*font)
-{
- Ref*ref = font->getID();
- GString*gstr = font->getName();
- char* fname = gstr==0?0:gstr->getCString();
- char buf[128];
- if(fname==0) {
- sprintf(buf, "font-%d-%d", ref->num, ref->gen);
- } else {
- sprintf(buf, "%s-%d-%d", fname, ref->num, ref->gen);
- }
- return strdup(buf);
-}
-
static char*getFontName(GfxFont*font)
{
char*fontid;
return fontname;
}
-static char mybuf[1024];
-static char* gfxstate2str(GfxState *state)
-{
- char*bufpos = mybuf;
- GfxRGB rgb;
- bufpos+=sprintf(bufpos,"CTM[%.3f/%.3f/%.3f/%.3f/%.3f/%.3f] ",
- state->getCTM()[0],
- state->getCTM()[1],
- state->getCTM()[2],
- state->getCTM()[3],
- state->getCTM()[4],
- state->getCTM()[5]);
- if(state->getX1()!=0.0)
- bufpos+=sprintf(bufpos,"X1-%.1f ",state->getX1());
- if(state->getY1()!=0.0)
- bufpos+=sprintf(bufpos,"Y1-%.1f ",state->getY1());
- bufpos+=sprintf(bufpos,"X2-%.1f ",state->getX2());
- bufpos+=sprintf(bufpos,"Y2-%.1f ",state->getY2());
- bufpos+=sprintf(bufpos,"PW%.1f ",state->getPageWidth());
- bufpos+=sprintf(bufpos,"PH%.1f ",state->getPageHeight());
- /*bufpos+=sprintf(bufpos,"FC[%.1f/%.1f] ",
- state->getFillColor()->c[0], state->getFillColor()->c[1]);
- bufpos+=sprintf(bufpos,"SC[%.1f/%.1f] ",
- state->getStrokeColor()->c[0], state->getFillColor()->c[1]);*/
-/* bufpos+=sprintf(bufpos,"FC[%.1f/%.1f/%.1f/%.1f/%.1f/%.1f/%.1f/%.1f]",
- state->getFillColor()->c[0], state->getFillColor()->c[1],
- state->getFillColor()->c[2], state->getFillColor()->c[3],
- state->getFillColor()->c[4], state->getFillColor()->c[5],
- state->getFillColor()->c[6], state->getFillColor()->c[7]);
- bufpos+=sprintf(bufpos,"SC[%.1f/%.1f/%.1f/%.1f/%.1f/%.1f/%.1f/%.1f]",
- state->getStrokeColor()->c[0], state->getFillColor()->c[1],
- state->getStrokeColor()->c[2], state->getFillColor()->c[3],
- state->getStrokeColor()->c[4], state->getFillColor()->c[5],
- state->getStrokeColor()->c[6], state->getFillColor()->c[7]);*/
- state->getFillRGB(&rgb);
- if(rgb.r || rgb.g || rgb.b)
- bufpos+=sprintf(bufpos,"FR[%.1f/%.1f/%.1f] ", rgb.r,rgb.g,rgb.b);
- state->getStrokeRGB(&rgb);
- if(rgb.r || rgb.g || rgb.b)
- bufpos+=sprintf(bufpos,"SR[%.1f/%.1f/%.1f] ", rgb.r,rgb.g,rgb.b);
- if(state->getFillColorSpace()->getNComps()>1)
- bufpos+=sprintf(bufpos,"CS[[%d]] ",state->getFillColorSpace()->getNComps());
- if(state->getStrokeColorSpace()->getNComps()>1)
- bufpos+=sprintf(bufpos,"SS[[%d]] ",state->getStrokeColorSpace()->getNComps());
- if(state->getFillPattern())
- bufpos+=sprintf(bufpos,"FP%08x ", state->getFillPattern());
- if(state->getStrokePattern())
- bufpos+=sprintf(bufpos,"SP%08x ", state->getStrokePattern());
-
- if(state->getFillOpacity()!=1.0)
- bufpos+=sprintf(bufpos,"FO%.1f ", state->getFillOpacity());
- if(state->getStrokeOpacity()!=1.0)
- bufpos+=sprintf(bufpos,"SO%.1f ", state->getStrokeOpacity());
-
- bufpos+=sprintf(bufpos,"LW%.1f ", state->getLineWidth());
-
- double * dash;
- int length;
- double start;
- state->getLineDash(&dash, &length, &start);
- int t;
- if(length)
- {
- bufpos+=sprintf(bufpos,"DASH%.1f[",start);
- for(t=0;t<length;t++) {
- bufpos+=sprintf(bufpos,"D%.1f",dash[t]);
- }
- bufpos+=sprintf(bufpos,"]");
- }
-
- if(state->getFlatness()!=1)
- bufpos+=sprintf(bufpos,"F%d ", state->getFlatness());
- if(state->getLineJoin()!=0)
- bufpos+=sprintf(bufpos,"J%d ", state->getLineJoin());
- if(state->getLineJoin()!=0)
- bufpos+=sprintf(bufpos,"C%d ", state->getLineCap());
- if(state->getLineJoin()!=0)
- bufpos+=sprintf(bufpos,"ML%d ", state->getMiterLimit());
-
- if(state->getFont() && getFontID(state->getFont()))
- bufpos+=sprintf(bufpos,"F\"%s\" ",getFontID(state->getFont()));
- bufpos+=sprintf(bufpos,"FS%.1f ", state->getFontSize());
- bufpos+=sprintf(bufpos,"MAT[%.1f/%.1f/%.1f/%.1f/%.1f/%.1f] ", state->getTextMat()[0],state->getTextMat()[1],state->getTextMat()[2],
- state->getTextMat()[3],state->getTextMat()[4],state->getTextMat()[5]);
- if(state->getCharSpace())
- bufpos+=sprintf(bufpos,"CS%.5f ", state->getCharSpace());
- if(state->getWordSpace())
- bufpos+=sprintf(bufpos,"WS%.5f ", state->getWordSpace());
- if(state->getHorizScaling()!=1.0)
- bufpos+=sprintf(bufpos,"SC%.1f ", state->getHorizScaling());
- if(state->getLeading())
- bufpos+=sprintf(bufpos,"L%.1f ", state->getLeading());
- if(state->getRise())
- bufpos+=sprintf(bufpos,"R%.1f ", state->getRise());
- if(state->getRender())
- bufpos+=sprintf(bufpos,"R%d ", state->getRender());
- bufpos+=sprintf(bufpos,"P%08x ", state->getPath());
- bufpos+=sprintf(bufpos,"CX%.1f ", state->getCurX());
- bufpos+=sprintf(bufpos,"CY%.1f ", state->getCurY());
- if(state->getLineX())
- bufpos+=sprintf(bufpos,"LX%.1f ", state->getLineX());
- if(state->getLineY())
- bufpos+=sprintf(bufpos,"LY%.1f ", state->getLineY());
- bufpos+=sprintf(bufpos," ");
- return mybuf;
-}
-
-static void dumpFontInfo(char*loglevel, GfxFont*font);
+static void dumpFontInfo(const char*loglevel, GfxFont*font);
static int lastdumps[1024];
static int lastdumppos = 0;
/* nr = 0 unknown
else if(nr == 1)
msg("<warning> The following font caused problems (substituting):");
else if(nr == 2)
- msg("<warning> The following Type 3 Font will be rendered as bitmap:");
+ msg("<warning> The following Type 3 Font will be rendered as graphics:");
dumpFontInfo("<warning>", font);
}
-static void dumpFontInfo(char*loglevel, GfxFont*font)
+static void dumpFontInfo(const char*loglevel, GfxFont*font)
{
char* id = getFontID(font);
char* name = getFontName(font);
//void GFXOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) {printf("void GFXOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) \n");}
//void GFXOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool inlineImg) {printf("void GFXOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool inlineImg) \n");}
-
void dump_outline(gfxline_t*line)
{
while(line) {
draw.lineTo(&draw, lastx, lasty);
}
gfxline_t*result = (gfxline_t*)draw.result(&draw);
+
+ gfxline_optimize(result);
+
return result;
}
-/*----------------------------------------------------------------------------
- * Primitive Graphic routines
- *----------------------------------------------------------------------------*/
+GBool GFXOutputDev::useTilingPatternFill()
+{
+ infofeature("tiled patterns");
+ return gFalse;
+}
-void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line)
+GBool GFXOutputDev::useShadedFills()
+{
+ infofeature("shaded fills");
+ return gFalse;
+}
+
+GBool GFXOutputDev::useDrawForm()
+{
+ infofeature("forms");
+ return gFalse;
+}
+void GFXOutputDev::drawForm(Ref id)
+{
+ msg("<error> drawForm not implemented");
+}
+GBool GFXOutputDev::needNonText()
+{
+ return gTrue;
+}
+void GFXOutputDev::endPage()
+{
+ msg("<verbose> endPage");
+}
+
+#define STROKE_FILL 1
+#define STROKE_CLIP 2
+void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
{
int lineCap = state->getLineCap(); // 0=butt, 1=round 2=square
int lineJoin = state->getLineJoin(); // 0=miter, 1=round 2=bevel
if(dashnum && ldash) {
float * dash = (float*)malloc(sizeof(float)*(dashnum+1));
int t;
- double cut = 0;
- int fixzero = 0;
msg("<trace> %d dashes", dashnum);
msg("<trace> | phase: %f", dashphase);
for(t=0;t<dashnum;t++) {
);
dump_outline(line);
}
-
- //swfoutput_drawgfxline(output, line, width, &col, capType, joinType, miterLimit);
- device->stroke(device, line, width, &col, capType, joinType, miterLimit);
+
+ if(flags&STROKE_FILL) {
+ ArtSVP* svp = gfxstrokeToSVP(line, width, capType, joinType, miterLimit);
+ gfxline_t*gfxline = SVPtogfxline(svp);
+ if(getLogLevel() >= LOGLEVEL_TRACE) {
+ dump_outline(gfxline);
+ }
+ if(!gfxline) {
+ msg("<warning> Empty polygon (resulting from stroked line)");
+ }
+ if(flags&STROKE_CLIP) {
+ device->startclip(device, gfxline);
+ states[statepos].clipping++;
+ } else {
+ device->fill(device, gfxline, &col);
+ }
+ free(gfxline);
+ art_svp_free(svp);
+ } else {
+ if(flags&STROKE_CLIP)
+ msg("<error> Stroke&clip not supported at the same time");
+ device->stroke(device, line, width, &col, capType, joinType, miterLimit);
+ }
if(line2)
gfxline_free(line2);
msg("<trace> fill %02x%02x%02x%02x\n", col.r, col.g, col.b, col.a);
dump_outline(line);
}
- if(states[statepos].transparencygroup && col.a != 255)
- return;
-
device->fill(device, line, &col);
}
void GFXOutputDev::clip(GfxState *state)
{
- if(states[statepos].createsoftmask)
- return;
-
GfxPath * path = state->getPath();
gfxline_t*line = gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
clipToGfxLine(state, line);
states[statepos].clipping++;
gfxline_free(line);
}
+void GFXOutputDev::clipToStrokePath(GfxState *state)
+{
+ GfxPath * path = state->getPath();
+ gfxline_t*line= gfxPath_to_gfxline(state, path, 0, user_movex + clipmovex, user_movey + clipmovey);
+
+ if(getLogLevel() >= LOGLEVEL_TRACE) {
+ msg("<trace> cliptostrokepath\n");
+ dump_outline(line);
+ }
+
+ strokeGfxline(state, line, STROKE_FILL|STROKE_CLIP);
+ gfxline_free(line);
+}
void GFXOutputDev::endframe()
{
device->endclip(device);
outer_clip_box = 0;
}
-
- device->endpage(device);
}
void GFXOutputDev::finish()
free(this->pages); this->pages = 0;
}
- fontlist_t*l = this->fontlist;
- while(l) {
- fontlist_t*next = l->next;
- l->next = 0;
- gfxfont_free(l->font);
- free(l->filename);l->filename=0;
- free(l);
- l = next;
- }
- this->fontlist = 0;
+ gfxfontlist_free(this->gfxfontlist);
};
GBool GFXOutputDev::upsideDown()
{
return gTrue;
}
-char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible",
+const char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible",
"clip+fill", "stroke+clip", "fill+stroke+clip", "clip"};
#define RENDER_FILL 0
return tmp_printstr;
}
-
-int getGfxCharID(gfxfont_t*font, int charnr, char *charname, int u)
-{
- char*uniname = 0;
- if(u>0) {
- int t;
- /* find out char name from unicode index
- TODO: should be precomputed
- */
- for(t=0;t<sizeof(nameToUnicodeTab)/sizeof(nameToUnicodeTab[0]);t++) {
- if(nameToUnicodeTab[t].u == u) {
- uniname = nameToUnicodeTab[t].name;
- break;
- }
- }
- }
-
- if(charname) {
- int t;
- for(t=0;t<font->num_glyphs;t++) {
- if(font->glyphs[t].name && !strcmp(font->glyphs[t].name,charname)) {
- msg("<debug> Char [%d,>%s<,%d] maps to %d\n", charnr, charname, u, t);
- return t;
- }
- }
- /* if we didn't find the character, maybe
- we can find the capitalized version */
- for(t=0;t<font->num_glyphs;t++) {
- if(font->glyphs[t].name && !strcasecmp(font->glyphs[t].name,charname)) {
- msg("<debug> Char [%d,>>%s<<,%d] maps to %d\n", charnr, charname, u, t);
- return t;
- }
- }
- }
-
- if(uniname) {
- int t;
- for(t=0;t<font->num_glyphs;t++) {
- if(font->glyphs[t].name && !strcmp(font->glyphs[t].name,uniname)) {
- msg("<debug> Char [%d,%s,>%d(%s)<] maps to %d\n", charnr, charname, u, uniname, t);
- return t;
- }
- }
- /* if we didn't find the character, maybe
- we can find the capitalized version */
- for(t=0;t<font->num_glyphs;t++) {
- if(font->glyphs[t].name && !strcasecmp(font->glyphs[t].name,uniname)) {
- msg("<debug> Char [%d,%s,>>%d(%s)<<] maps to %d\n", charnr, charname, u, uniname, t);
- return t;
- }
- }
- }
-
- /* try to use the unicode id */
- if(u>=0 && u<font->max_unicode && font->unicode2glyph[u]>=0) {
- msg("<debug> Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->unicode2glyph[u]);
- return font->unicode2glyph[u];
- }
-
- if(charnr>=0 && charnr<font->num_glyphs) {
- msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
- return charnr;
- }
-
- return -1;
-}
-
-
void GFXOutputDev::beginString(GfxState *state, GString *s)
{
int render = state->getRender();
msg("<trace> beginString(%s) render=%d", makeStringPrintable(s->getCString()), render);
double m11,m21,m12,m22;
-// msg("<debug> %s beginstring \"%s\"\n", gfxstate2str(state), s->getCString());
state->getFontTransMat(&m11, &m12, &m21, &m22);
m11 *= state->getHorizScaling();
m21 *= state->getHorizScaling();
this->current_font_matrix.m11 = -m22 / 1024.0;
this->current_font_matrix.tx = 0;
this->current_font_matrix.ty = 0;
+}
- gfxmatrix_t m = this->current_font_matrix;
+static gfxline_t* mkEmptyGfxShape(double x, double y)
+{
+ gfxline_t*line = (gfxline_t*)malloc(sizeof(gfxline_t));
+ line->x = x;line->y = y;line->type = gfx_moveTo;line->next = 0;
+ return line;
+}
- /*if(render != 3 && render != 0)
- msg("<warning> Text rendering mode %d (%s) not fully supported yet (for text \"%s\")", render, renderModeDesc[render&7], makeStringPrintable(s->getCString()));*/
- states[statepos].textRender = render;
+static char isValidUnicode(int c)
+{
+ if(c>=32 && c<0x2fffe)
+ return 1;
+ return 0;
}
void GFXOutputDev::drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
- CharCode c, int nBytes, Unicode *_u, int uLen)
+ CharCode charid, int nBytes, Unicode *_u, int uLen)
{
- if(states[statepos].createsoftmask)
- return;
-
- int render = state->getRender();
- // check for invisible text -- this is used by Acrobat Capture
- if (render == 3) {
- msg("<debug> Ignoring invisible text: char %d at %f,%f", c, x, y);
+ if(!current_fontinfo || (unsigned)charid >= current_fontinfo->num_glyphs || !current_fontinfo->glyphs[charid]) {
+ msg("<error> Invalid charid %d for font %s", charid, current_font_id);
return;
}
- if(states[statepos].textRender != render)
- msg("<error> Internal error: drawChar.render!=beginString.render");
+ CharCode glyphid = current_fontinfo->glyphs[charid]->glyphid;
+ int render = state->getRender();
gfxcolor_t col = getFillColor(state);
- Gushort *CIDToGIDMap = 0;
+ // check for invisible text -- this is used by Acrobat Capture
+ if (render == RENDER_INVISIBLE) {
+ col.a = 0;
+ }
+
GfxFont*font = state->getFont();
- if(font->getType() == fontType3) {
+ if(font->getType() == fontType3 && do_interpretType3Chars) {
/* type 3 chars are passed as graphics */
msg("<debug> type3 char at %f/%f", x, y);
return;
}
-
- Unicode u=0;
- char*name=0;
-
- if(uLen)
- u = _u[0];
-
- if(font->isCIDFont()) {
- GfxCIDFont*cfont = (GfxCIDFont*)font;
-
- if(font->getType() == fontCIDType2)
- CIDToGIDMap = cfont->getCIDToGID();
- } else {
- Gfx8BitFont*font8;
- font8 = (Gfx8BitFont*)font;
- char**enc=font8->getEncoding();
- name = enc[c];
- }
- if (CIDToGIDMap) {
- msg("<debug> drawChar(%f, %f, c='%c' (%d), GID=%d, u=%d <%d>) CID=%d name=\"%s\" render=%d\n", x, y, (c&127)>=32?c:'?', c, CIDToGIDMap[c], u, uLen, font->isCIDFont(), FIXNULL(name), render);
- c = CIDToGIDMap[c];
- } else {
- msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d name=\"%s\" render=%d\n",x,y,(c&127)>=32?c:'?',c,u, uLen, font->isCIDFont(), FIXNULL(name), render);
- }
- int charid = -1;
-
- if(uLen<=1) {
- charid = getGfxCharID(current_gfxfont, c, name, u);
- } else {
- charid = getGfxCharID(current_gfxfont, c, name, -1);
-
- if(charid < 0) {
- /* multiple unicodes- should usually map to a ligature.
- if the ligature doesn't exist, we need to draw
- the characters one-by-one. */
- int t;
- msg("<warning> ligature %d missing in font %s\n", c, current_gfxfont->id);
- for(t=0;t<uLen;t++) {
- drawChar(state, x, y, dx, dy, originX, originY, c, nBytes, _u+t, 1);
- }
- return;
- }
- }
- if(charid<0) {
- msg("<warning> Didn't find character '%s' (c=%d,u=%d) in current charset (%s, %d characters)",
- FIXNULL(name),c, u, FIXNULL((char*)current_gfxfont->id), current_gfxfont->num_glyphs);
- return;
- }
+ Unicode u = uLen?(_u[0]):0;
+ msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d\n",x,y,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render);
gfxmatrix_t m = this->current_font_matrix;
state->transform(x, y, &m.tx, &m.ty);
m.tx += user_movex + clipmovex;
m.ty += user_movey + clipmovey;
- if(render == RENDER_FILL) {
- device->drawchar(device, current_gfxfont, charid, &col, &m);
+ if(render == RENDER_FILL || render == RENDER_INVISIBLE) {
+ device->drawchar(device, current_gfxfont, glyphid, &col, &m);
} else {
msg("<debug> Drawing glyph %d as shape", charid);
if(!textmodeinfo) {
msg("<notice> Some texts will be rendered as shape");
textmodeinfo = 1;
}
- gfxline_t*glyph = current_gfxfont->glyphs[charid].line;
+ gfxline_t*glyph = current_gfxfont->glyphs[glyphid].line;
gfxline_t*tglyph = gfxline_clone(glyph);
gfxline_transform(tglyph, &m);
if((render&3) != RENDER_INVISIBLE) {
if(render&RENDER_CLIP) {
gfxline_t*add = gfxline_clone(tglyph);
current_text_clip = gfxline_append(current_text_clip, add);
+ if(!current_text_clip) {
+ current_text_clip = mkEmptyGfxShape(m.tx, m.ty);
+ }
}
gfxline_free(tglyph);
}
{
int render = state->getRender();
msg("<trace> endString() render=%d textstroke=%08x", render, current_text_stroke);
- if(states[statepos].textRender != render)
- msg("<error> Internal error: drawChar.render!=beginString.render");
if(current_text_stroke) {
/* fillstroke and stroke text rendering objects we can process right
current_text_stroke = 0;
} else if((render&3) == RENDER_FILLSTROKE) {
fillGfxLine(state, current_text_stroke);
- strokeGfxline(state, current_text_stroke);
+ strokeGfxline(state, current_text_stroke,0);
gfxline_free(current_text_stroke);
current_text_stroke = 0;
} else if((render&3) == RENDER_STROKE) {
- strokeGfxline(state, current_text_stroke);
+ strokeGfxline(state, current_text_stroke,0);
gfxline_free(current_text_stroke);
current_text_stroke = 0;
}
{
int render = state->getRender();
msg("<trace> endTextObject() render=%d textstroke=%08x clipstroke=%08x", render, current_text_stroke, current_text_clip);
- if(states[statepos].textRender != render)
- msg("<error> Internal error: drawChar.render!=beginString.render");
if(current_text_clip) {
device->setparameter(device, "mark","TXT");
{
msg("<debug> beginType3Char %d, %08x, %d", code, *u, uLen);
type3active = 1;
+
+ /*int t;
+
+ gfxcolor_t col={255,0,0,0};
+ gfxmatrix_t m = {1,0,0, 0,1,0};
+
+ for(t=0;t<uLen;t++) {
+ device->drawchar(device, 0, u[t], &col, &m);
+ }*/
+
/* the character itself is going to be passed using the draw functions */
return gFalse; /* gTrue= is_in_cache? */
}
}
device->startpage(device, width, height);
+ this->width = width;
+ this->height = height;
}
void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
clippath[3].type = gfx_lineTo;clippath[3].x = x1; clippath[3].y = y2; clippath[3].next = &clippath[4];
clippath[4].type = gfx_lineTo;clippath[4].x = x1; clippath[4].y = y1; clippath[4].next = 0;
device->startclip(device, clippath); outer_clip_box = 1;
- device->fill(device, clippath, &white);
+ if(!config_transparent)
+ device->fill(device, clippath, &white);
}
-void GFXOutputDev::drawLink(Link *link, Catalog *catalog)
+
+void GFXOutputDev::processLink(Link *link, Catalog *catalog)
{
double x1, y1, x2, y2, w;
gfxline_t points[5];
LinkAction*action=link->getAction();
char buf[128];
char*s = 0;
- char*type = "-?-";
+ const char*type = "-?-";
char*named = 0;
int page = -1;
msg("<trace> drawlink action=%d\n", action->getKind());
}
void GFXOutputDev::saveState(GfxState *state) {
- msg("<trace> saveState\n");
- updateAll(state);
- if(statepos>=64) {
- msg("<error> Too many nested states in pdf.");
- return;
- }
- statepos ++;
- states[statepos].textRender = states[statepos-1].textRender;
- states[statepos].createsoftmask = states[statepos-1].createsoftmask;
- states[statepos].transparencygroup = states[statepos-1].transparencygroup;
- states[statepos].clipping = 0;
+ dbg("saveState");dbgindent+=2;
+
+ msg("<trace> saveState\n");
+ updateAll(state);
+ if(statepos>=64) {
+ msg("<error> Too many nested states in pdf.");
+ return;
+ }
+ statepos ++;
+ states[statepos].createsoftmask = states[statepos-1].createsoftmask;
+ states[statepos].transparencygroup = states[statepos-1].transparencygroup;
+ states[statepos].clipping = 0;
};
void GFXOutputDev::restoreState(GfxState *state) {
+ dbgindent-=2; dbg("restoreState");
+
if(statepos==0) {
msg("<error> Invalid restoreState");
return;
}
- msg("<trace> restoreState");
+ msg("<trace> restoreState%s%s", states[statepos].softmask?" (end softmask)":"",
+ states[statepos].clipping?" (end clipping)":"");
+ if(states[statepos].softmask) {
+ clearSoftMask(state);
+ }
updateAll(state);
while(states[statepos].clipping) {
device->endclip(device);
statepos--;
}
-char* GFXOutputDev::searchFont(char*name)
-{
- int i;
- char*filename=0;
- int is_standard_font = 0;
-
- msg("<verbose> SearchFont(%s)", name);
-
- /* see if it is a pdf standard font */
- for(i=0;i<sizeof(pdf2t1map)/sizeof(mapping);i++)
- {
- if(!strcmp(name, pdf2t1map[i].pdffont))
- {
- name = pdf2t1map[i].filename;
- is_standard_font = 1;
- break;
- }
- }
- /* look in all font files */
- for(i=0;i<fontnum;i++)
- {
- if(strstr(fonts[i].filename, name))
- {
- if(!fonts[i].used) {
-
- fonts[i].used = 1;
- if(!is_standard_font)
- msg("<notice> Using %s for %s", fonts[i].filename, name);
- }
- return strdup(fonts[i].filename);
- }
- }
- return 0;
-}
-
void GFXOutputDev::updateLineWidth(GfxState *state)
{
double width = state->getTransformedLineWidth();
GfxRGB rgb;
double opaq = state->getFillOpacity();
state->getFillRGB(&rgb);
+ dbg("update fillopaq %f", opaq);
}
-
-void GFXOutputDev::updateStrokeColor(GfxState *state)
+void GFXOutputDev::updateStrokeOpacity(GfxState *state)
{
- GfxRGB rgb;
- double opaq = state->getStrokeOpacity();
- state->getStrokeRGB(&rgb);
+ double opaq = state->getFillOpacity();
+ dbg("update strokeopaq %f", opaq);
}
-
-void FoFiWrite(void *stream, char *data, int len)
+void GFXOutputDev::updateFillOverprint(GfxState *state)
{
- int ret = fwrite(data, len, 1, (FILE*)stream);
+ double opaq = state->getFillOverprint();
+ dbg("update filloverprint %f", opaq);
}
-
-char*GFXOutputDev::writeEmbeddedFontToFile(XRef*ref, GfxFont*font)
+void GFXOutputDev::updateStrokeOverprint(GfxState *state)
{
- char*tmpFileName = NULL;
- FILE *f;
- int c;
- char *fontBuf;
- int fontLen;
- Ref embRef;
- Object refObj, strObj;
- char namebuf[512];
- tmpFileName = mktmpname(namebuf);
- int ret;
-
- ret = font->getEmbeddedFontID(&embRef);
- if(!ret) {
- msg("<verbose> Didn't get embedded font id");
- /* not embedded- the caller should now search the font
- directories for this font */
- return 0;
- }
-
- f = fopen(tmpFileName, "wb");
- if (!f) {
- msg("<error> Couldn't create temporary Type 1 font file");
- return 0;
- }
-
- /*if(font->isCIDFont()) {
- GfxCIDFont* cidFont = (GfxCIDFont *)font;
- GString c = cidFont->getCollection();
- msg("<notice> Collection: %s", c.getCString());
- }*/
-
- //if (font->getType() == fontType1C) {
- if (0) { //font->getType() == fontType1C) {
- if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
- fclose(f);
- msg("<error> Couldn't read embedded font file");
- return 0;
- }
- FoFiType1C *cvt = FoFiType1C::make(fontBuf, fontLen);
- if(!cvt) return 0;
- cvt->convertToType1(NULL, gTrue, FoFiWrite, f);
- //cvt->convertToCIDType0("test", f);
- //cvt->convertToType0("test", f);
- delete cvt;
- gfree(fontBuf);
- } else if(font->getType() == fontTrueType) {
- msg("<verbose> writing font using TrueTypeFontFile::writeTTF");
- if (!(fontBuf = font->readEmbFontFile(xref, &fontLen))) {
- fclose(f);
- msg("<error> Couldn't read embedded font file");
- return 0;
- }
- FoFiTrueType *cvt = FoFiTrueType::make(fontBuf, fontLen);
- cvt->writeTTF(FoFiWrite, f);
- delete cvt;
- gfree(fontBuf);
- } else {
- font->getEmbeddedFontID(&embRef);
- refObj.initRef(embRef.num, embRef.gen);
- refObj.fetch(ref, &strObj);
- refObj.free();
- strObj.streamReset();
- int f4[4];
- char f4c[4];
- int t;
- for(t=0;t<4;t++) {
- f4[t] = strObj.streamGetChar();
- f4c[t] = (char)f4[t];
- if(f4[t] == EOF)
- break;
- }
- if(t==4) {
- if(!strncmp(f4c, "true", 4)) {
- /* some weird TTF fonts don't start with 0,1,0,0 but with "true".
- Change this on the fly */
- f4[0] = f4[2] = f4[3] = 0;
- f4[1] = 1;
- }
- fputc(f4[0], f);
- fputc(f4[1], f);
- fputc(f4[2], f);
- fputc(f4[3], f);
-
- while ((c = strObj.streamGetChar()) != EOF) {
- fputc(c, f);
- }
- }
- strObj.streamClose();
- strObj.free();
- }
- fclose(f);
-
- return strdup(tmpFileName);
+ double opaq = state->getStrokeOverprint();
+ dbg("update strokeoverprint %f", opaq);
}
-
-char* GFXOutputDev::searchForSuitableFont(GfxFont*gfxFont)
+void GFXOutputDev::updateTransfer(GfxState *state)
{
- char*name = getFontName(gfxFont);
- char*fontname = 0;
- char*filename = 0;
-
- if(!this->config_use_fontconfig)
- return 0;
-
-#ifdef HAVE_FONTCONFIG
- FcPattern *pattern, *match;
- FcResult result;
- FcChar8 *v;
-
- static int fcinitcalled = false;
-
- msg("<debug> searchForSuitableFont(%s)", name);
-
- // call init ony once
- if (!fcinitcalled) {
- msg("<debug> Initializing FontConfig...");
- fcinitcalled = true;
- if(!FcInit()) {
- msg("<debug> FontConfig Initialization failed. Disabling.");
- config_use_fontconfig = 0;
- return 0;
- }
- msg("<debug> ...initialized FontConfig");
- }
-
- msg("<debug> FontConfig: Create \"%s\" Family Pattern", name);
- pattern = FcPatternBuild(NULL, FC_FAMILY, FcTypeString, name, NULL);
- if (gfxFont->isItalic()) // check for italic
- msg("<debug> FontConfig: Adding Italic Slant");
- FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
- if (gfxFont->isBold()) // check for bold
- msg("<debug> FontConfig: Adding Bold Weight");
- FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
-
- msg("<debug> FontConfig: Try to match...");
- // configure and match using the original font name
- FcConfigSubstitute(0, pattern, FcMatchPattern);
- FcDefaultSubstitute(pattern);
- match = FcFontMatch(0, pattern, &result);
-
- if (FcPatternGetString(match, "family", 0, &v) == FcResultMatch) {
- msg("<debug> FontConfig: family=%s", (char*)v);
- // if we get an exact match
- if (strcmp((char *)v, name) == 0) {
- if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) {
- filename = strdup((char*)v); // mem leak
- char *nfn = strrchr(filename, '/');
- if(nfn) fontname = strdup(nfn+1);
- else fontname = filename;
- }
- msg("<debug> FontConfig: Returning \"%s\"", fontname);
- } else {
- // initialize patterns
- FcPatternDestroy(pattern);
- FcPatternDestroy(match);
-
- // now match against serif etc.
- if (gfxFont->isSerif()) {
- msg("<debug> FontConfig: Create Serif Family Pattern");
- pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "serif", NULL);
- } else if (gfxFont->isFixedWidth()) {
- msg("<debug> FontConfig: Create Monospace Family Pattern");
- pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "monospace", NULL);
- } else {
- msg("<debug> FontConfig: Create Sans Family Pattern");
- pattern = FcPatternBuild (NULL, FC_FAMILY, FcTypeString, "sans", NULL);
- }
-
- // check for italic
- if (gfxFont->isItalic()) {
- msg("<debug> FontConfig: Adding Italic Slant");
- int bb = FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
- }
- // check for bold
- if (gfxFont->isBold()) {
- msg("<debug> FontConfig: Adding Bold Weight");
- int bb = FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
- }
-
- msg("<debug> FontConfig: Try to match... (2)");
- // configure and match using serif etc
- FcConfigSubstitute (0, pattern, FcMatchPattern);
- FcDefaultSubstitute (pattern);
- match = FcFontMatch (0, pattern, &result);
-
- if (FcPatternGetString(match, "file", 0, &v) == FcResultMatch) {
- filename = strdup((char*)v); // mem leak
- char *nfn = strrchr(filename, '/');
- if(nfn) fontname = strdup(nfn+1);
- else fontname = filename;
- }
- msg("<debug> FontConfig: Returning \"%s\"", fontname);
- }
- }
-
- //printf("FONTCONFIG: pattern");
- //FcPatternPrint(pattern);
- //printf("FONTCONFIG: match");
- //FcPatternPrint(match);
-
- FcPatternDestroy(pattern);
- FcPatternDestroy(match);
-
- pdfswf_addfont(filename);
- return fontname;
-#else
- return 0;
-#endif
+ dbg("update transfer");
}
-char* GFXOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
-{
- char*fontname = 0, *filename = 0;
- msg("<notice> substituteFont(%s)", oldname);
-
- if(!(fontname = searchForSuitableFont(gfxFont))) {
- fontname = "Times-Roman";
- }
- filename = searchFont(fontname);
- if(!filename) {
- msg("<error> Couldn't find font %s- did you install the default fonts?", fontname);
- return 0;
- }
-
- if(substitutepos>=sizeof(substitutesource)/sizeof(char*)) {
- msg("<fatal> Too many fonts in file.");
- exit(1);
- }
- if(oldname) {
- substitutesource[substitutepos] = strdup(oldname); //mem leak
- substitutetarget[substitutepos] = fontname;
- msg("<notice> substituting %s -> %s", FIXNULL(oldname), FIXNULL(fontname));
- substitutepos ++;
- }
- return strdup(filename); //mem leak
-}
-void unlinkfont(char* filename)
+void GFXOutputDev::updateStrokeColor(GfxState *state)
{
- int l;
- if(!filename)
- return;
- l=strlen(filename);
- unlink(filename);
- if(!strncmp(&filename[l-4],".afm",4)) {
- memcpy(&filename[l-4],".pfb",4);
- unlink(filename);
- memcpy(&filename[l-4],".pfa",4);
- unlink(filename);
- memcpy(&filename[l-4],".afm",4);
- return;
- } else
- if(!strncmp(&filename[l-4],".pfa",4)) {
- memcpy(&filename[l-4],".afm",4);
- unlink(filename);
- memcpy(&filename[l-4],".pfa",4);
- return;
- } else
- if(!strncmp(&filename[l-4],".pfb",4)) {
- memcpy(&filename[l-4],".afm",4);
- unlink(filename);
- memcpy(&filename[l-4],".pfb",4);
- return;
- }
+ GfxRGB rgb;
+ double opaq = state->getStrokeOpacity();
+ state->getStrokeRGB(&rgb);
}
void GFXOutputDev::setXRef(PDFDoc*doc, XRef *xref)
this->xref = xref;
}
-int GFXOutputDev::setGfxFont(char*id, char*name, char*filename, double maxSize)
+gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src)
{
- gfxfont_t*font = 0;
- fontlist_t*last=0,*l = this->fontlist;
+ gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
+ memset(font, 0, sizeof(gfxfont_t));
- if(!id)
- msg("<error> Internal Error: FontID is null");
-
- /* TODO: should this be part of the state? */
- while(l) {
- last = l;
- if(!strcmp(l->font->id, id)) {
- current_gfxfont = l->font;
- font = l->font;
- device->addfont(device, current_gfxfont);
- return 1;
+ font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs);
+ memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);
+ font->id = strdup(getFontName(xpdffont));
+ int t;
+ double quality = (1024 * 0.05) / src->max_size;
+ double scale = 1;
+ //printf("%d glyphs\n", font->num_glyphs);
+ font->num_glyphs = 0;
+ for(t=0;t<src->num_glyphs;t++) {
+ if(src->glyphs[t]) {
+ SplashPath*path = src->glyphs[t]->path;
+ int len = path?path->getLength():0;
+ //printf("glyph %d) %08x (%d line segments)\n", t, path, len);
+ gfxglyph_t*glyph = &font->glyphs[font->num_glyphs];
+ src->glyphs[t]->glyphid = font->num_glyphs;
+ glyph->unicode = src->glyphs[t]->unicode;
+ if(glyph->unicode >= font->max_unicode)
+ font->max_unicode = glyph->unicode+1;
+ gfxdrawer_t drawer;
+ gfxdrawer_target_gfxline(&drawer);
+ int s;
+ int count = 0;
+ double xmax = 0;
+ for(s=0;s<len;s++) {
+ Guchar f;
+ double x, y;
+ path->getPoint(s, &x, &y, &f);
+ if(x > xmax)
+ xmax = x;
+ if(f&splashPathFirst) {
+ drawer.moveTo(&drawer, x*scale, y*scale);
+ }
+ if(f&splashPathCurve) {
+ double x2,y2;
+ path->getPoint(++s, &x2, &y2, &f);
+ if(f&splashPathCurve) {
+ double x3,y3;
+ path->getPoint(++s, &x3, &y3, &f);
+ gfxdraw_cubicTo(&drawer, x*scale, y*scale, x2*scale, y2*scale, x3*scale, y3*scale, quality);
+ } else {
+ drawer.splineTo(&drawer, x*scale, y*scale, x2*scale, y2*scale);
+ }
+ } else {
+ drawer.lineTo(&drawer, x*scale, y*scale);
+ }
+ // printf("%f %f %s %s\n", x, y, (f&splashPathCurve)?"curve":"",
+ // (f&splashPathFirst)?"first":"",
+ // (f&splashPathLast)?"last":"");
+ }
+ glyph->line = (gfxline_t*)drawer.result(&drawer);
+ glyph->advance = xmax*scale; // we don't know the real advance value, so this'll have to do
+ font->num_glyphs++;
}
- l = l->next;
}
- if(!filename) return 0;
-
- /* A font size of e.g. 9 means the font will be scaled down by
- 1024 and scaled up by 9. So to have a maximum error of 1/20px,
- we have to divide 0.05 by (fontsize/1024)
- */
- double quality = (1024 * 0.05) / maxSize;
-
- msg("<verbose> Loading %s...", filename);
- font = gfxfont_load(id, filename, quality);
- if(!font) {
- msg("<verbose> Couldn't load Font %s (%s)", filename, id);
- return 0;
- }
- msg("<verbose> Font %s (%s) loaded successfully", filename, id);
+ font->unicode2glyph = (int*)malloc(sizeof(int)*font->max_unicode);
+ memset(font->unicode2glyph, -1, sizeof(int)*font->max_unicode);
+ for(t=0;t<font->num_glyphs;t++) {
+ if(font->glyphs[t].unicode>0 && font->glyphs[t].unicode<font->max_unicode) {
+ font->unicode2glyph[font->glyphs[t].unicode] = t;
+ }
- l = new fontlist_t;
- l->font = font;
- l->filename = strdup(filename);
- l->next = 0;
- current_gfxfont = l->font;
- if(last) {
- last->next = l;
- } else {
- this->fontlist = l;
}
- device->addfont(device, current_gfxfont);
- return 1;
+ return font;
}
void GFXOutputDev::updateFont(GfxState *state)
{
- GfxFont*gfxFont = state->getFont();
-
+ GfxFont* gfxFont = state->getFont();
if (!gfxFont) {
- return;
+ return;
}
-
- char * fontid = getFontID(gfxFont);
- char * fontname = getFontName(gfxFont);
-
- double maxSize = 1.0;
-
- if(this->info) {
- maxSize = this->info->getMaximumFontSize(fontid);
- }
-
- int t;
- /* first, look if we substituted this font before-
- this way, we don't initialize the T1 Fonts
- too often */
- for(t=0;t<substitutepos;t++) {
- if(!strcmp(fontid, substitutesource[t])) {
- free(fontid);fontid=0;
- fontid = strdup(substitutetarget[t]);
- break;
- }
- }
-
- /* second, see if this is a font which was used before-
- if so, we are done */
- if(setGfxFont(fontid, fontname, 0, 0)) {
- free(fontid);
- free(fontname);
- return;
- }
-/* if(swfoutput_queryfont(&device, fontid))
- swfoutput_setfont(&device, fontid, 0);
-
- msg("<debug> updateFont(%s) [cached]", fontid);
- return;
- }*/
-
- // look for Type 3 font
- if (gfxFont->getType() == fontType3) {
- if(!type3Warning) {
- type3Warning = gTrue;
- showFontError(gfxFont, 2);
- }
- free(fontid);
- free(fontname);
- return;
- }
-
- /* now either load the font, or find a substitution */
-
- Ref embRef;
- GBool embedded = gfxFont->getEmbeddedFontID(&embRef);
-
- char*fileName = 0;
- int del = 0;
- if(embedded &&
- (gfxFont->getType() == fontType1 ||
- gfxFont->getType() == fontType1C ||
- (gfxFont->getType() == fontCIDType0C && forceType0Fonts) ||
- gfxFont->getType() == fontTrueType ||
- gfxFont->getType() == fontCIDType2
- ))
- {
- fileName = writeEmbeddedFontToFile(xref, gfxFont);
- if(!fileName) showFontError(gfxFont,0);
- else del = 1;
- } else {
- fileName = searchFont(fontname);
- if(!fileName) showFontError(gfxFont,0);
- }
- if(!fileName) {
- char * fontname = getFontName(gfxFont);
- msg("<warning> Font %s %scould not be loaded.", fontname, embedded?"":"(not embedded) ");
-
- if(lastfontdir)
- msg("<warning> Try putting a TTF version of that font (named \"%s.ttf\") into %s", fontname, lastfontdir);
- else
- msg("<warning> Try specifying one or more font directories");
-
- fileName = substituteFont(gfxFont, fontid);
- if(!fileName)
- exit(1);
- if(fontid) { free(fontid);fontid = strdup(substitutetarget[substitutepos-1]); /*ugly hack*/};
- msg("<notice> Font is now %s (%s)", fontid, fileName);
- }
-
- if(!fileName) {
- msg("<error> Couldn't set font %s\n", fontid);
- free(fontid);
- free(fontname);
- return;
+ char*id = getFontID(gfxFont);
+ if(!id) {
+ msg("<error> Internal Error: FontID is null");
+ return;
}
-
- msg("<verbose> updateFont(%s) -> %s (max size: %f)", fontid, fileName, maxSize);
- dumpFontInfo("<verbose>", gfxFont);
- //swfoutput_setfont(&device, fontid, fileName);
+ this->current_fontinfo = this->info->getFont(id);
- if(!setGfxFont(fontid, fontname, 0, 0)) {
- setGfxFont(fontid, fontname, fileName, maxSize);
+ gfxfont_t*font = gfxfontlist_findfont(this->gfxfontlist,id);
+ if(!font) {
+ font = createGfxFont(gfxFont, current_fontinfo);
+ gfxfontlist_addfont(this->gfxfontlist, font);
+ device->addfont(device, font);
}
-
- if(fileName && del)
- unlinkfont(fileName);
-
- if(fileName)
- free(fileName);
- free(fontid);
- free(fontname);
-
- msg("<verbose> |");
+ current_gfxfont = font;
+ free(id);
}
#define SQR(x) ((x)*(x))
state->transform(1, 0, &x3, &y3); x3 += user_movex + clipmovex; y3 += user_movey + clipmovey;
state->transform(1, 1, &x4, &y4); x4 += user_movex + clipmovex; y4 += user_movey + clipmovey;
-
if(!pbminfo && !(str->getKind()==strDCT)) {
if(!type3active) {
msg("<notice> file contains pbm pictures %s",mask?"(masked)":"");
int width, int height, GBool invert,
GBool inlineImg)
{
- if(states[statepos].createsoftmask)
- return;
+ dbg("drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
msg("<verbose> drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1, 0, 0,0,0,0, 0);
}
int width, int height, GfxImageColorMap *colorMap,
int *maskColors, GBool inlineImg)
{
- if(states[statepos].createsoftmask)
- return;
+ dbg("drawImage %dx%d, %s, %s, inline=%d", width, height,
+ colorMap?"colorMap":"no colorMap",
+ maskColors?"maskColors":"no maskColors",
+ inlineImg);
msg("<verbose> drawImage %dx%d, %s, %s, inline=%d", width, height,
colorMap?"colorMap":"no colorMap",
maskColors?"maskColors":"no maskColors",
Stream *maskStr, int maskWidth, int maskHeight,
GBool maskInvert)
{
- if(states[statepos].createsoftmask)
- return;
+ dbg("drawMaskedImage %dx%d, %s, %dx%d mask", width, height,
+ colorMap?"colorMap":"no colorMap",
+ maskWidth, maskHeight);
msg("<verbose> drawMaskedImage %dx%d, %s, %dx%d mask", width, height,
colorMap?"colorMap":"no colorMap",
maskWidth, maskHeight);
int maskWidth, int maskHeight,
GfxImageColorMap *maskColorMap)
{
- if(states[statepos].createsoftmask)
- return;
+ dbg("drawSoftMaskedImage %dx%d, %s, %dx%d mask", width, height,
+ colorMap?"colorMap":"no colorMap",
+ maskWidth, maskHeight);
msg("<verbose> drawSoftMaskedImage %dx%d, %s, %dx%d mask", width, height,
colorMap?"colorMap":"no colorMap",
maskWidth, maskHeight);
void GFXOutputDev::stroke(GfxState *state)
{
- if(states[statepos].createsoftmask)
- return;
+ dbg("stroke");
GfxPath * path = state->getPath();
gfxline_t*line= gfxPath_to_gfxline(state, path, 0, user_movex + clipmovex, user_movey + clipmovey);
- strokeGfxline(state, line);
+ strokeGfxline(state, line, 0);
gfxline_free(line);
}
void GFXOutputDev::fill(GfxState *state)
{
- if(states[statepos].createsoftmask)
- return;
+ gfxcolor_t col = getFillColor(state);
+ dbg("fill %02x%02x%02x%02x",col.r,col.g,col.b,col.a);
GfxPath * path = state->getPath();
gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
void GFXOutputDev::eoFill(GfxState *state)
{
- if(states[statepos].createsoftmask)
- return;
-
- GfxPath * path = state->getPath();
gfxcolor_t col = getFillColor(state);
+ dbg("eofill %02x%02x%02x%02x",col.r,col.g,col.b,col.a);
+ GfxPath * path = state->getPath();
gfxline_t*line= gfxPath_to_gfxline(state, path, 1, user_movex + clipmovex, user_movey + clipmovey);
-
- if(getLogLevel() >= LOGLEVEL_TRACE) {
- msg("<trace> eofill\n");
- dump_outline(line);
- }
-
- device->fill(device, line, &col);
+ fillGfxLine(state, line);
gfxline_free(line);
}
-static char* dirseparator()
+static const char* dirseparator()
{
#ifdef WIN32
return "\\";
#endif
}
-void addGlobalFont(char*filename)
+void addGlobalFont(const char*filename)
{
fontfile_t f;
memset(&f, 0, sizeof(fontfile_t));
f.filename = filename;
if(fontnum < sizeof(fonts)/sizeof(fonts[0])) {
msg("<verbose> Adding font \"%s\".", filename);
+ msg("<warning> External fonts are not supported with this version. Ignoring font %s", filename);
fonts[fontnum++] = f;
} else {
msg("<error> Too many external fonts. Not adding font file \"%s\".", filename);
}
}
-void addGlobalLanguageDir(char*dir)
+void addGlobalLanguageDir(const char*dir)
{
- if(!globalParams)
- globalParams = new GlobalParams("");
-
msg("<notice> Adding %s to language pack directories", dir);
int l;
fclose(fi);
}
-void addGlobalFontDir(char*dirname)
+void addGlobalFontDir(const char*dirname)
{
+ msg("<warning> External fonts are not supported with this version. Ignoring directory %s", dirname);
+ return;
#ifdef HAVE_DIRENT_H
msg("<notice> Adding %s to font directories", dirname);
lastfontdir = strdup(dirname);
if(pdfpage>this->pagepos)
this->pagepos = pdfpage;
}
-
-#if xpdfUpdateVersion >= 16
+
+struct BBox
+{
+ double posx,posy;
+ double width,height;
+};
+
+BBox mkBBox(GfxState*state, double*bbox, double width, double height)
+{
+ double xMin, yMin, xMax, yMax, x, y;
+ double tx, ty, w, h;
+ // transform the bbox
+ state->transform(bbox[0], bbox[1], &x, &y);
+ xMin = xMax = x;
+ yMin = yMax = y;
+ state->transform(bbox[0], bbox[3], &x, &y);
+ if (x < xMin) {
+ xMin = x;
+ } else if (x > xMax) {
+ xMax = x;
+ }
+ if (y < yMin) {
+ yMin = y;
+ } else if (y > yMax) {
+ yMax = y;
+ }
+ state->transform(bbox[2], bbox[1], &x, &y);
+ if (x < xMin) {
+ xMin = x;
+ } else if (x > xMax) {
+ xMax = x;
+ }
+ if (y < yMin) {
+ yMin = y;
+ } else if (y > yMax) {
+ yMax = y;
+ }
+ state->transform(bbox[2], bbox[3], &x, &y);
+ if (x < xMin) {
+ xMin = x;
+ } else if (x > xMax) {
+ xMax = x;
+ }
+ if (y < yMin) {
+ yMin = y;
+ } else if (y > yMax) {
+ yMax = y;
+ }
+ tx = (int)floor(xMin);
+ if (tx < 0) {
+ tx = 0;
+ } else if (tx > width) {
+ tx = width;
+ }
+ ty = (int)floor(yMin);
+ if (ty < 0) {
+ ty = 0;
+ } else if (ty > height) {
+ ty = height;
+ }
+ w = (int)ceil(xMax) - tx + 1;
+ if (tx + w > width) {
+ w = width - tx;
+ }
+ if (w < 1) {
+ w = 1;
+ }
+ h = (int)ceil(yMax) - ty + 1;
+ if (ty + h > height) {
+ h = height - ty;
+ }
+ if (h < 1) {
+ h = 1;
+ }
+ BBox nbbox;
+ nbbox.posx = xMin;
+ nbbox.posx = yMin;
+ nbbox.width = w;
+ nbbox.height = h;
+ return nbbox;
+}
+
void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox,
GfxColorSpace *blendingColorSpace,
GBool isolated, GBool knockout,
GBool forSoftMask)
{
- char*colormodename = GfxColorSpace::getColorSpaceModeName(blendingColorSpace->getMode());
+ const char*colormodename = "";
+ BBox rect = mkBBox(state, bbox, this->width, this->height);
+
+ if(blendingColorSpace) {
+ colormodename = GfxColorSpace::getColorSpaceModeName(blendingColorSpace->getMode());
+ }
+ dbg("beginTransparencyGroup %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
+ dbg("using clipping rect %f/%f/%f/%f\n", rect.posx,rect.posy,rect.width,rect.height);
msg("<verbose> beginTransparencyGroup %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
- states[statepos].createsoftmask = forSoftMask;
+
+ states[statepos].createsoftmask |= forSoftMask;
states[statepos].transparencygroup = !forSoftMask;
+ states[statepos].isolated = isolated;
+
+ states[statepos].olddevice = this->device;
+ this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
+
+ gfxdevice_record_init(this->device);
- if(!forSoftMask) {
+ /*if(!forSoftMask) { ////???
state->setFillOpacity(0.0);
- }
- warnfeature("transparency groups",1);
+ }*/
+ dbgindent+=2;
}
void GFXOutputDev::endTransparencyGroup(GfxState *state)
{
+ dbgindent-=2;
+ dbg("endTransparencyGroup");
msg("<verbose> endTransparencyGroup");
+
+ gfxdevice_t*r = this->device;
+
+ this->device = states[statepos].olddevice;
+
+ if(states[statepos].createsoftmask) {
+ states[statepos-1].softmaskrecording = r->finish(r);
+ } else {
+ states[statepos-1].grouprecording = r->finish(r);
+ }
+
states[statepos].createsoftmask = 0;
states[statepos].transparencygroup = 0;
+ free(r);
}
void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
{
- msg("<verbose> paintTransparencyGroup");
+ const char*blendmodes[] = {"normal","multiply","screen","overlay","darken", "lighten",
+ "colordodge","colorburn","hardlight","softlight","difference",
+ "exclusion","hue","saturation","color","luminosity"};
+
+ dbg("paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
+ msg("<verbose> paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
+
+ if(state->getBlendMode() == gfxBlendNormal)
+ infofeature("transparency groups");
+ else {
+ char buffer[80];
+ sprintf(buffer, "%s blended transparency groups", blendmodes[state->getBlendMode()]);
+ warnfeature(buffer, 0);
+ }
+
+ gfxresult_t*grouprecording = states[statepos].grouprecording;
+
+ if(state->getBlendMode() == gfxBlendNormal) {
+ gfxdevice_t ops;
+ gfxdevice_ops_init(&ops, this->device, (unsigned char)(state->getFillOpacity()*255));
+ gfxresult_record_replay(grouprecording, &ops);
+ ops.finish(&ops);
+ }
+ grouprecording->destroy(grouprecording);
+
+ states[statepos].grouprecording = 0;
}
void GFXOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Function *transferFunc, GfxColor *rgb)
{
+ /* alpha = 1: retrieve mask values from alpha layer
+ alpha = 0: retrieve mask values from luminance */
+ dbg("setSoftMask %.1f/%.1f/%.1f/%.1f alpha=%d backdrop=%02x%02x%02x",
+ bbox[0], bbox[1], bbox[2], bbox[3], alpha, colToByte(rgb->c[0]), colToByte(rgb->c[1]), colToByte(rgb->c[2]));
msg("<verbose> setSoftMask %.1f/%.1f/%.1f/%.1f alpha=%d backdrop=%02x%02x%02x",
bbox[0], bbox[1], bbox[2], bbox[3], alpha, colToByte(rgb->c[0]), colToByte(rgb->c[1]), colToByte(rgb->c[2]));
- warnfeature("soft masks",0);
+ if(!alpha)
+ infofeature("soft masks");
+ else
+ warnfeature("soft masks from alpha channel",0);
+
+ states[statepos].olddevice = this->device;
+ this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
+ gfxdevice_record_init(this->device);
+
+ dbg("softmaskrecording is %08x at statepos %d\n", states[statepos].softmaskrecording, statepos);
+
+ states[statepos].softmask = 1;
+ states[statepos].softmask_alpha = alpha;
+}
+
+static inline Guchar div255(int x) {
+ return (Guchar)((x + (x >> 8) + 0x80) >> 8);
+}
+
+static unsigned char clampU8(unsigned char c, unsigned char min, unsigned char max)
+{
+ if(c < min) c = min;
+ if(c > max) c = max;
+ return c;
}
void GFXOutputDev::clearSoftMask(GfxState *state)
{
+ if(!states[statepos].softmask)
+ return;
+ states[statepos].softmask = 0;
+ dbg("clearSoftMask statepos=%d", statepos);
msg("<verbose> clearSoftMask");
-}
+
+ if(!states[statepos].softmaskrecording || strcmp(this->device->name, "record")) {
+ msg("<error> Error in softmask/tgroup ordering");
+ return;
+ }
+
+ gfxresult_t*mask = states[statepos].softmaskrecording;
+ gfxresult_t*below = this->device->finish(this->device);
+ this->device = states[statepos].olddevice;
+
+ /* get outline of all objects below the soft mask */
+ gfxdevice_t uniondev;
+ gfxdevice_union_init(&uniondev, 0);
+ gfxresult_record_replay(below, &uniondev);
+ gfxline_t*belowoutline = gfxdevice_union_getunion(&uniondev);
+ uniondev.finish(&uniondev);
+
+ gfxbbox_t bbox = gfxline_getbbox(belowoutline);
+#if 0
+ this->device->startclip(this->device, belowoutline);
+ gfxresult_record_replay(below, this->device);
+ gfxresult_record_replay(mask, this->device);
+ this->device->endclip(this->device);
+ gfxline_free(belowoutline);
#endif
+
+ int width = (int)bbox.xmax,height = (int)bbox.ymax;
+ if(width<=0 || height<=0)
+ return;
-/*class MemCheck
-{
- public: ~MemCheck()
- {
- delete globalParams;globalParams=0;
- Object::memCheck(stderr);
- gMemReport(stderr);
+ gfxdevice_t belowrender;
+ gfxdevice_render_init(&belowrender);
+ if(states[statepos+1].isolated) {
+ belowrender.setparameter(&belowrender, "fillwhite", "1");
+ }
+ belowrender.setparameter(&belowrender, "antialize", "2");
+ belowrender.startpage(&belowrender, width, height);
+ gfxresult_record_replay(below, &belowrender);
+ belowrender.endpage(&belowrender);
+ gfxresult_t* belowresult = belowrender.finish(&belowrender);
+ gfximage_t* belowimg = (gfximage_t*)belowresult->get(belowresult,"page0");
+ //writePNG("below.png", (unsigned char*)belowimg->data, belowimg->width, belowimg->height);
+
+ gfxdevice_t maskrender;
+ gfxdevice_render_init(&maskrender);
+ maskrender.startpage(&maskrender, width, height);
+ gfxresult_record_replay(mask, &maskrender);
+ maskrender.endpage(&maskrender);
+ gfxresult_t* maskresult = maskrender.finish(&maskrender);
+ gfximage_t* maskimg = (gfximage_t*)maskresult->get(maskresult,"page0");
+
+ if(belowimg->width != maskimg->width || belowimg->height != maskimg->height) {
+ msg("<fatal> Internal error in mask drawing");
+ return;
}
-} myMemCheck;*/
+
+ int y,x;
+ for(y=0;y<height;y++) {
+ gfxcolor_t* l1 = &maskimg->data[maskimg->width*y];
+ gfxcolor_t* l2 = &belowimg->data[belowimg->width*y];
+ for(x=0;x<width;x++) {
+ int alpha;
+ if(states[statepos].softmask_alpha) {
+ alpha = l1->a;
+ } else {
+ alpha = (77*l1->r + 151*l1->g + 28*l1->b) >> 8;
+ }
+
+ l2->a = div255(alpha*l2->a);
+
+ /* DON'T premultiply alpha- this is done by fillbitmap,
+ depending on the output device */
+ //l2->r = div255(alpha*l2->r);
+ //l2->g = div255(alpha*l2->g);
+ //l2->b = div255(alpha*l2->b);
+
+ l1++;
+ l2++;
+ }
+ }
+ gfxline_t*line = gfxline_makerectangle(0,0,width,height);
+
+ gfxmatrix_t matrix;
+ matrix.m00 = 1.0; matrix.m10 = 0.0; matrix.tx = 0.0;
+ matrix.m01 = 0.0; matrix.m11 = 1.0; matrix.ty = 0.0;
+
+ this->device->fillbitmap(this->device, line, belowimg, &matrix, 0);
+
+ mask->destroy(mask);
+ below->destroy(below);
+ maskresult->destroy(maskresult);
+ belowresult->destroy(belowresult);
+ states[statepos].softmaskrecording = 0;
+}
+
+//class MemCheck
+//{
+// public: ~MemCheck()
+// {
+// delete globalParams;globalParams=0;
+// Object::memCheck(stderr);
+// gMemReport(stderr);
+// }
+//} myMemCheck;
git.asbjorn.biz / swftools.git / blobdiff