X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fpdf%2FBitmapOutputDev.cc;h=49f5e3cda539b2178ac39a8eabae3a2fe4cbfc95;hp=9db530e07d85b5206e1e98f95effbe34e7651537;hb=bd6e5cd809f4fa605f8505fa06712981b3443537;hpb=297bdc42a1fa0988faed0e3281d5bbe6ed8c6f1e diff --git a/lib/pdf/BitmapOutputDev.cc b/lib/pdf/BitmapOutputDev.cc index 9db530e..49f5e3c 100644 --- a/lib/pdf/BitmapOutputDev.cc +++ b/lib/pdf/BitmapOutputDev.cc @@ -253,12 +253,13 @@ void BitmapOutputDev::flushBitmap() up to the left and right of bitmaps. */ out[x].r = 0;out[x].g = 0;out[x].b = 0;out[x].a = 0; } else { - /* according to endPage()/compositeBackground() in xpdf/SplashOutputDev.cc, we - have to premultiply alpha (mix background and pixel according to the alpha channel). + /* according to endPage()/compositeBackground() in xpdf/SplashOutputDev.cc, this + data has non-premultiplied alpha, which is exactly what the output device + expects, so don't premultiply it here, either. */ - out[x].r = (in[x*3+0]*ain[x])/255; - out[x].g = (in[x*3+1]*ain[x])/255; - out[x].b = (in[x*3+2]*ain[x])/255; + out[x].r = in[x*3+0]; + out[x].g = in[x*3+1]; + out[x].b = in[x*3+2]; out[x].a = ain[x]; } } @@ -453,16 +454,49 @@ static void update_bitmap(SplashBitmap*bitmap, SplashBitmap*update, int x1, int if(!fixBBox(&x1, &y1, &x2, &y2, bitmap->getWidth(), bitmap->getHeight())) return; - Guchar*b = bitmap->getDataPtr() + y1*width8; - Guchar*u = update->getDataPtr() + y1*width8; + Guchar*b = bitmap->getDataPtr() + y1*width8 + x1/8; + Guchar*u = update->getDataPtr() + y1*width8 + x1/8; + int yspan = y2-y1; + int xspan = (x2+7)/8 - x1/8; int size = (y2-y1)*width8; if(overwrite) { - memcpy(b, u, size); + int y; + for(y=0;y Testing new text data against current bitmap data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter); - if(0) { char filename1[80]; char filename2[80]; char filename3[80]; - sprintf(filename1, "state%dboolbitmap_afternewtext.png", dbg_btm_counter); - sprintf(filename2, "state%dbooltext_afternewtext.png", dbg_btm_counter); - sprintf(filename3, "state%dbitmap_afternewtext.png", dbg_btm_counter); + sprintf(filename1, "state%03dboolbitmap_after%s.png", dbg_btm_counter, newdata); + sprintf(filename2, "state%03dbooltext_after%s.png", dbg_btm_counter, newdata); + sprintf(filename3, "state%03dbitmap_after%s.png", dbg_btm_counter, newdata); msg(" %s %s %s", filename1, filename2, filename3); writeAlpha(stalepolybitmap, filename1); writeAlpha(booltextbitmap, filename2); writeBitmap(rgbdev->getBitmap(), filename3); } dbg_btm_counter++; +} + +GBool BitmapOutputDev::checkNewText(int x1, int y1, int x2, int y2) +{ + /* called once some new text was drawn on booltextdev, and + before the same thing is drawn on gfxdev */ + + msg(" Testing new text data against current bitmap data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter); GBool ret = false; if(intersection(booltextbitmap, stalepolybitmap, x1,y1,x2,y2)) { @@ -549,20 +586,6 @@ GBool BitmapOutputDev::checkNewBitmap(int x1, int y1, int x2, int y2) /* similar to checkNewText() above, only in reverse */ msg(" Testing new graphics data against current text data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter); - if(0) { - char filename1[80]; - char filename2[80]; - char filename3[80]; - sprintf(filename1, "state%dboolbitmap_afternewgfx.png", dbg_btm_counter); - sprintf(filename2, "state%dbooltext_afternewgfx.png", dbg_btm_counter); - sprintf(filename3, "state%dbitmap_afternewgfx.png", dbg_btm_counter); - msg(" %s %s %s", filename1, filename2, filename3); - writeAlpha(stalepolybitmap, filename1); - writeAlpha(booltextbitmap, filename2); - writeBitmap(rgbdev->getBitmap(), filename3); - } - dbg_btm_counter++; - GBool ret = false; if(intersection(boolpolybitmap, staletextbitmap, x1,y1,x2,y2)) { if(layerstate==STATE_PARALLEL) { @@ -583,7 +606,7 @@ GBool BitmapOutputDev::checkNewBitmap(int x1, int y1, int x2, int y2) } else { update_bitmap(stalepolybitmap, boolpolybitmap, x1, y1, x2, y2, 0); } - + /* clear the thing we just drew from our temporary drawing bitmap */ clearBooleanBitmap(boolpolybitmap, x1, y1, x2, y2); @@ -674,7 +697,7 @@ GBool compare8(unsigned char*data1, unsigned char*data2, int len) if(!len) return 0; if(((ptroff_t)data1&7)==((ptroff_t)data2&7)) { - // oh good, we can do aligning + // oh good, we can align both to 8 byte while((ptroff_t)data1&7) { if(*data1&*data2) return 1; @@ -1295,6 +1318,7 @@ void BitmapOutputDev::stroke(GfxState *state) bbox.xmax += width; bbox.ymax += width; checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax)); rgbdev->stroke(state); + dbg_newdata("stroke"); } void BitmapOutputDev::fill(GfxState *state) { @@ -1303,6 +1327,7 @@ void BitmapOutputDev::fill(GfxState *state) gfxbbox_t bbox = getBBox(state); checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax)); rgbdev->fill(state); + dbg_newdata("fill"); } void BitmapOutputDev::eoFill(GfxState *state) { @@ -1311,6 +1336,7 @@ void BitmapOutputDev::eoFill(GfxState *state) gfxbbox_t bbox = getBBox(state); checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax)); rgbdev->eoFill(state); + dbg_newdata("eofill"); } #if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207 void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str, @@ -1323,6 +1349,7 @@ void BitmapOutputDev::tilingPatternFill(GfxState *state, Object *str, boolpolydev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep); checkNewBitmap(UNKNOWN_BOUNDING_BOX); rgbdev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep); + dbg_newdata("tilingpatternfill"); } #else void BitmapOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str, @@ -1335,6 +1362,7 @@ void BitmapOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str, boolpolydev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep); checkNewBitmap(UNKNOWN_BOUNDING_BOX); rgbdev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep); + dbg_newdata("tilingpatternfill"); } #endif @@ -1487,6 +1515,7 @@ void BitmapOutputDev::drawChar(GfxState *state, double x, double y, gfxdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen); } } + dbg_newdata("text"); } void BitmapOutputDev::drawString(GfxState *state, GString *s) { @@ -1503,6 +1532,7 @@ void BitmapOutputDev::endTextObject(GfxState *state) /* the only thing "drawn" here is clipping */ //checkNewText(UNKNOWN_BOUNDING_BOX); gfxdev->endTextObject(state); + dbg_newdata("endtextobject"); } void BitmapOutputDev::endString(GfxState *state) { @@ -1517,6 +1547,7 @@ void BitmapOutputDev::endString(GfxState *state) checkNewText(UNKNOWN_BOUNDING_BOX); } gfxdev->endString(state); + dbg_newdata("endstring"); } void BitmapOutputDev::endStringOp(GfxState *state) { @@ -1525,6 +1556,7 @@ void BitmapOutputDev::endStringOp(GfxState *state) clip1dev->endStringOp(state); booltextdev->endStringOp(state); gfxdev->endStringOp(state); + dbg_newdata("endstringop"); } /* TODO: these four operations below *should* do nothing, as type3 @@ -1589,22 +1621,22 @@ gfxbbox_t BitmapOutputDev::getImageBBox(GfxState*state) double x,y; state->transform(0, 1, &x, &y); bbox.xmin=bbox.xmax = x; - bbox.ymin=bbox.ymax = x; + bbox.ymin=bbox.ymax = y; state->transform(0, 0, &x, &y); bbox.xmin=min(bbox.xmin,x); bbox.ymin=min(bbox.ymin,y); - bbox.xmax=max(bbox.xmin,x); - bbox.ymax=max(bbox.ymin,y); + bbox.xmax=max(bbox.xmax,x); + bbox.ymax=max(bbox.ymax,y); state->transform(1, 0, &x, &y); bbox.xmin=min(bbox.xmin,x); bbox.ymin=min(bbox.ymin,y); - bbox.xmax=max(bbox.xmin,x); - bbox.ymax=max(bbox.ymin,y); + bbox.xmax=max(bbox.xmax,x); + bbox.ymax=max(bbox.ymax,y); state->transform(1, 1, &x, &y); bbox.xmin=min(bbox.xmin,x); bbox.ymin=min(bbox.ymin,y); - bbox.xmax=max(bbox.xmin,x); - bbox.ymax=max(bbox.ymin,y); + bbox.xmax=max(bbox.xmax,x); + bbox.ymax=max(bbox.ymax,y); return bbox; } void BitmapOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, @@ -1612,34 +1644,32 @@ void BitmapOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, GBool inlineImg) { msg(" drawImageMask streamkind=%d", str->getKind()); - CopyStream*cpystr = 0; - if(inlineImg) { - cpystr = new CopyStream(str, height * ((width + 7) / 8)); - str = cpystr->getStream(); - } + + CopyStream*cpystr = new CopyStream(str, height * ((width + 7) / 8)); + str = cpystr->getStream(); + boolpolydev->drawImageMask(state, ref, str, width, height, invert, inlineImg); gfxbbox_t bbox = getImageBBox(state); checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax)); rgbdev->drawImageMask(state, ref, str, width, height, invert, inlineImg); - if(cpystr) - delete cpystr; + delete cpystr; + dbg_newdata("imagemask"); } void BitmapOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg) { msg(" drawImage streamkind=%d", str->getKind()); - CopyStream*cpystr = 0; - if(inlineImg) { - cpystr = new CopyStream(str, height * ((width * colorMap->getNumPixelComps() * colorMap->getBits() + 7) / 8)); - str = cpystr->getStream(); - } + + CopyStream*cpystr = new CopyStream(str, height * ((width * colorMap->getNumPixelComps() * colorMap->getBits() + 7) / 8)); + str = cpystr->getStream(); + boolpolydev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); gfxbbox_t bbox=getImageBBox(state); checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax)); rgbdev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); - if(cpystr) - delete cpystr; + delete cpystr; + dbg_newdata("image"); } void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, @@ -1648,10 +1678,16 @@ void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, GBool maskInvert) { msg(" drawMaskedImage streamkind=%d", str->getKind()); + + CopyStream*cpystr = new CopyStream(str, height * ((width * colorMap->getNumPixelComps() * colorMap->getBits() + 7) / 8)); + str = cpystr->getStream(); + boolpolydev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert); gfxbbox_t bbox=getImageBBox(state); checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax)); rgbdev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert); + delete cpystr; + dbg_newdata("maskedimage"); } void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, @@ -1661,10 +1697,16 @@ void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream * GfxImageColorMap *maskColorMap) { msg(" drawSoftMaskedImage %dx%d (%dx%d) streamkind=%d", width, height, maskWidth, maskHeight, str->getKind()); + + CopyStream*cpystr = new CopyStream(str, height * ((width * colorMap->getNumPixelComps() * colorMap->getBits() + 7) / 8)); + str = cpystr->getStream(); + boolpolydev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap); gfxbbox_t bbox=getImageBBox(state); checkNewBitmap(bbox.xmin, bbox.ymin, ceil(bbox.xmax), ceil(bbox.ymax)); rgbdev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap); + delete cpystr; + dbg_newdata("softmaskimage"); } void BitmapOutputDev::drawForm(Ref id) { @@ -1702,6 +1744,7 @@ void BitmapOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, clip1dev->beginTransparencyGroup(state, bbox, blendingColorSpace, isolated, knockout, forSoftMask); delete state1; delete state2; + dbg_newdata("endtransparencygroup"); } void BitmapOutputDev::endTransparencyGroup(GfxState *state) { @@ -1723,6 +1766,7 @@ void BitmapOutputDev::endTransparencyGroup(GfxState *state) delete state1; delete state2; clip1dev->endTransparencyGroup(state); + dbg_newdata("endtransparencygroup"); } void BitmapOutputDev::paintTransparencyGroup(GfxState *state, double *bbox) { @@ -1731,6 +1775,7 @@ void BitmapOutputDev::paintTransparencyGroup(GfxState *state, double *bbox) checkNewBitmap(UNKNOWN_BOUNDING_BOX); rgbdev->paintTransparencyGroup(state,bbox); clip1dev->paintTransparencyGroup(state,bbox); + dbg_newdata("painttransparencygroup"); } void BitmapOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Function *transferFunc, GfxColor *backdropColor) { @@ -1739,6 +1784,7 @@ void BitmapOutputDev::setSoftMask(GfxState *state, double *bbox, GBool alpha, Fu checkNewBitmap(UNKNOWN_BOUNDING_BOX); rgbdev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor); clip1dev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor); + dbg_newdata("setsoftmask"); } void BitmapOutputDev::clearSoftMask(GfxState *state) { @@ -1747,4 +1793,5 @@ void BitmapOutputDev::clearSoftMask(GfxState *state) checkNewBitmap(UNKNOWN_BOUNDING_BOX); rgbdev->clearSoftMask(state); clip1dev->clearSoftMask(state); + dbg_newdata("clearsoftmask"); }