X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FGFXOutputDev.cc;h=0fb2591ab49571a8a4feaac9ca1ef72d13887569;hb=8e4e0278a8fbde7e4f65402f3692724aad4e9698;hp=49bb6dbba021a39c4db854c1f4c165548255d7bc;hpb=857174c423aafd86768d8f74eee7228208cd92fc;p=swftools.git diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc index 49bb6db..0fb2591 100644 --- a/lib/pdf/GFXOutputDev.cc +++ b/lib/pdf/GFXOutputDev.cc @@ -80,6 +80,8 @@ #include +#define SQRT2 1.41421356237309504880 + typedef struct _fontfile { const char*filename; @@ -152,16 +154,9 @@ static void dbg(const char*format, ...) } -typedef struct _feature -{ - char*string; - struct _feature*next; -} feature_t; -feature_t*featurewarnings = 0; - void GFXOutputDev::showfeature(const char*feature, char fully, char warn) { - feature_t*f = featurewarnings; + feature_t*f = this->featurewarnings; while(f) { if(!strcmp(feature, f->string)) return; @@ -169,8 +164,8 @@ void GFXOutputDev::showfeature(const char*feature, char fully, char warn) } f = (feature_t*)malloc(sizeof(feature_t)); f->string = strdup(feature); - f->next = featurewarnings; - featurewarnings = f; + f->next = this->featurewarnings; + this->featurewarnings = f; if(warn) { msg(" %s not yet %ssupported!",feature,fully?"fully ":""); if(this->config_break_on_warning) { @@ -582,6 +577,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc) this->gfxfontlist = gfxfontlist_create(); memset(states, 0, sizeof(states)); + this->featurewarnings = 0; }; void GFXOutputDev::setParameter(const char*key, const char*value) @@ -864,7 +860,7 @@ void GFXOutputDev::tilingPatternFill(GfxState *state, Object *str, int x0, int y0, int x1, int y1, double xStep, double yStep) #else -void GFXBitmapOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str, +void GFXOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str, int paintType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, @@ -1032,8 +1028,13 @@ void GFXOutputDev::endPage() device->endclip(device); outer_clip_box = 0; } + this->dashPattern = 0; + /* notice: we're not fully done yet with this page- there might still be + a few calls to drawLink() yet to come */ } +static inline double sqr(double x) {return x*x;} + #define STROKE_FILL 1 #define STROKE_CLIP 2 void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags) @@ -1054,7 +1055,7 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags) col.g = colToByte(rgb.g); col.b = colToByte(rgb.b); col.a = (unsigned char)(opaq*255); - + gfx_capType capType = gfx_capRound; if(lineCap == 0) capType = gfx_capButt; else if(lineCap == 1) capType = gfx_capRound; @@ -1065,28 +1066,37 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags) else if(lineJoin == 1) joinType = gfx_joinRound; else if(lineJoin == 2) joinType = gfx_joinBevel; - int dashnum = 0; - double dashphase = 0; - double * ldash = 0; - state->getLineDash(&ldash, &dashnum, &dashphase); - gfxline_t*line2 = 0; - if(dashnum && ldash) { - float * dash = (float*)malloc(sizeof(float)*(dashnum+1)); + if(this->dashLength && this->dashPattern) { + float * dash = (float*)malloc(sizeof(float)*(this->dashLength+1)); int t; - msg(" %d dashes", dashnum); - msg(" | phase: %f", dashphase); - for(t=0;t | d%-3d: %f", t, ldash[t]); + + /* try to find out how much the transformation matrix would + stretch the dashes, and factor that into the dash lengths. + This is not the entirely correct approach- it would be + better to first convert the path to an unscaled version, + then apply dashing, and then transform the path using + the current transformation matrix. However there are few + PDFs which actually stretch a dashed path in a non-orthonormal + way */ + double tx1, ty1, tx2, ty2; + this->transformXY(state, 0, 0, &tx1, &ty1); + this->transformXY(state, 1, 1, &tx2, &ty2); + double f = sqrt(sqr(tx2-tx1)+sqr(ty2-ty1)) / SQRT2; + + msg(" %d dashes", this->dashLength); + msg(" | phase: %f", this->dashStart); + for(t=0;tdashLength;t++) { + dash[t] = (float)this->dashPattern[t] * f; + msg(" | d%-3d: %f", t, this->dashPattern[t]); } - dash[dashnum] = -1; + dash[this->dashLength] = -1; if(getLogLevel() >= LOGLEVEL_TRACE) { dump_outline(line); } - line2 = gfxtool_dash_line(line, dash, (float)dashphase); + line2 = gfxtool_dash_line(line, dash, (float)(this->dashStart*f)); line = line2; free(dash); msg(" After dashing:"); @@ -1097,7 +1107,7 @@ void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags) width, lineJoin==0?"miter": (lineJoin==1?"round":"bevel"), lineCap==0?"butt": (lineJoin==1?"round":"square"), - dashnum, + this->dashLength, col.r,col.g,col.b,col.a ); dump_outline(line); @@ -1218,6 +1228,18 @@ GFXOutputDev::~GFXOutputDev() if(this->pages) { free(this->pages); this->pages = 0; } + + feature_t*f = this->featurewarnings; + while(f) { + feature_t*next = f->next; + if(f->string) { + free(f->string);f->string =0; + } + f->next = 0; + free(f); + f = next; + } + this->featurewarnings = 0; gfxfontlist_free(this->gfxfontlist, 1);this->gfxfontlist = 0; }; @@ -1325,7 +1347,7 @@ void GFXOutputDev::drawChar(GfxState *state, double x, double y, // check for invisible text -- this is used by Acrobat Capture if (render == RENDER_INVISIBLE) { - col.a = 0; + col.a = 255; if(!config_extrafontdata) return; } @@ -1521,6 +1543,10 @@ void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, doubl states[statepos].clipbbox.ymin = x1; states[statepos].clipbbox.xmax = x2; states[statepos].clipbbox.ymax = y2; + + this->dashPattern = 0; + this->dashLength = 0; + this->dashStart = 0; } @@ -1747,11 +1773,19 @@ void GFXOutputDev::restoreState(GfxState *state) { } statepos--; } + +void GFXOutputDev::updateLineDash(GfxState *state) +{ + state->getLineDash(&this->dashPattern, &this->dashLength, &this->dashStart); + msg(" updateLineDash, %d dashes", this->dashLength); + if(!this->dashLength) { + this->dashPattern = 0; + } +} void GFXOutputDev::updateLineWidth(GfxState *state) { double width = state->getTransformedLineWidth(); - //swfoutput_setlinewidth(&device, width); } void GFXOutputDev::updateLineCap(GfxState *state) @@ -1806,14 +1840,14 @@ void GFXOutputDev::updateStrokeColor(GfxState *state) } -gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src, double config_fontquality) +static gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src, double config_fontquality) { gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t)); memset(font, 0, sizeof(gfxfont_t)); font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs); memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs); - font->id = strdup(getFontID(xpdffont)); + font->id = 0; int t; double quality = (INTERNAL_FONT_SIZE * 200 / config_fontquality) / src->max_size; @@ -2114,14 +2148,14 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, if(!pbminfo && !(str->getKind()==strDCT)) { if(!type3active) { - msg(" file contains pbm pictures %s",mask?"(masked)":""); + msg(" File contains pbm pictures %s",mask?"(masked)":""); pbminfo = 1; } if(mask) msg(" drawing %d by %d masked picture", width, height); } if(!jpeginfo && (str->getKind()==strDCT)) { - msg(" file contains jpeg pictures"); + msg(" File contains jpeg pictures"); jpeginfo = 1; } @@ -2169,7 +2203,7 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, width = realwidth; height = realheight; - free(pic); + delete[] pic; pic = pic2; /* make a black/white palette */ @@ -2191,8 +2225,8 @@ void GFXOutputDev::drawGeneralImage(GfxState *state, Object *ref, Stream *str, } } drawimagelossless(device, pic2, width, height, x1,y1,x2,y2,x3,y3,x4,y4); - free(pic2); - free(pic); + delete[] pic2; + delete[] pic; delete imgStr; if(maskbitmap) free(maskbitmap); return; @@ -2553,14 +2587,15 @@ void GFXOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, void GFXOutputDev::endTransparencyGroup(GfxState *state) { dbgindent-=2; - dbg("endTransparencyGroup"); - msg(" endTransparencyGroup"); - gfxdevice_t*r = this->device; this->device = states[statepos].olddevice; gfxresult_t*recording = r->finish(r); + + dbg("endTransparencyGroup forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording); + msg(" endTransparencyGroup forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording); + if(states[statepos].createsoftmask) { states[statepos-1].softmaskrecording = recording; } else { @@ -2654,7 +2689,7 @@ void GFXOutputDev::clearSoftMask(GfxState *state) } gfxresult_t*mask = states[statepos].softmaskrecording; - gfxresult_t*below = this->device->finish(this->device); + gfxresult_t*below = this->device->finish(this->device);free(this->device); this->device = states[statepos].olddevice; /* get outline of all objects below the soft mask */ @@ -2663,14 +2698,13 @@ void GFXOutputDev::clearSoftMask(GfxState *state) gfxresult_record_replay(below, &uniondev); gfxline_t*belowoutline = gfxdevice_union_getunion(&uniondev); uniondev.finish(&uniondev); - gfxbbox_t bbox = gfxline_getbbox(belowoutline); + gfxline_free(belowoutline);belowoutline=0; #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;