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];
}
}
}
}
-GBool BitmapOutputDev::checkNewText(int x1, int y1, int x2, int y2)
+void BitmapOutputDev::dbg_newdata(char*newdata)
{
- /* called once some new text was drawn on booltextdev, and
- before the same thing is drawn on gfxdev */
-
- msg("<trace> 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("<verbose> %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("<trace> 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)) {
/* similar to checkNewText() above, only in reverse */
msg("<trace> 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("<verbose> %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) {
} 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);
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)
{
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)
{
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,
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,
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
int x1 = (int)x, x2 = (int)x+1, y1 = (int)y, y2 = (int)y+1;
SplashFont*font = clip0dev->getCurrentFont();
SplashPath*path = font?font->getGlyphPath(code):NULL;
-
- if(!path) {
- if(code)
- msg("<error> couldn't create outline for char %d", code);
- return;
- }
x-=originX;
y-=originY;
- path->offset((SplashCoord)x, (SplashCoord)y);
- int t;
- for(t=0;t<path->getLength();t++) {
- double xx,yy;
- Guchar f;
- path->getPoint(t,&xx,&yy,&f);
- state->transform(xx,yy,&xx,&yy);
- if(xx<x1) x1=(int)xx;
- if(yy<y1) y1=(int)yy;
- if(xx>=x2) x2=(int)xx+1;
- if(yy>=y2) y2=(int)yy+1;
+ if(path) {
+ path->offset((SplashCoord)x, (SplashCoord)y);
+ int t;
+ for(t=0;t<path->getLength();t++) {
+ double xx,yy;
+ Guchar f;
+ path->getPoint(t,&xx,&yy,&f);
+ state->transform(xx,yy,&xx,&yy);
+ if(xx<x1) x1=(int)xx;
+ if(yy<y1) y1=(int)yy;
+ if(xx>=x2) x2=(int)xx+1;
+ if(yy>=y2) y2=(int)yy+1;
+ }
+ delete(path);path=0;
}
- delete(path);path=0;
/* if this character is affected somehow by the various clippings (i.e., it looks
different on a device without clipping), then draw it on the bitmap, not as
gfxdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
}
}
+ dbg_newdata("text");
}
void BitmapOutputDev::drawString(GfxState *state, GString *s)
{
/* the only thing "drawn" here is clipping */
//checkNewText(UNKNOWN_BOUNDING_BOX);
gfxdev->endTextObject(state);
+ dbg_newdata("endtextobject");
}
void BitmapOutputDev::endString(GfxState *state)
{
checkNewText(UNKNOWN_BOUNDING_BOX);
}
gfxdev->endString(state);
+ dbg_newdata("endstring");
}
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
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,
rgbdev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
if(cpystr)
delete cpystr;
+ dbg_newdata("imagemask");
}
void BitmapOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
rgbdev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
if(cpystr)
delete cpystr;
+ dbg_newdata("image");
}
void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
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);
+ dbg_newdata("maskedimage");
}
void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
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);
+ dbg_newdata("softmaskimage");
}
void BitmapOutputDev::drawForm(Ref id)
{
clip1dev->beginTransparencyGroup(state, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
delete state1;
delete state2;
+ dbg_newdata("endtransparencygroup");
}
void BitmapOutputDev::endTransparencyGroup(GfxState *state)
{
delete state1;
delete state2;
clip1dev->endTransparencyGroup(state);
+ dbg_newdata("endtransparencygroup");
}
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)
{
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)
{
checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->clearSoftMask(state);
clip1dev->clearSoftMask(state);
+ dbg_newdata("clearsoftmask");
}
git.asbjorn.biz / swftools.git / blobdiff