#include "../png.h"
#include "../devices/record.h"
-#define UNKNOWN_BOUNDING_BOX 0,0,0,0
-
static SplashColor splash_white = {255,255,255};
static SplashColor splash_black = {0,0,0};
SplashColorPtr rgb = rgbbitmap->getDataPtr();
Guchar*alpha = rgbbitmap->getAlphaPtr();
- Guchar*alpha2 = boolpolybitmap->getAlphaPtr();
int xmin,ymin,xmax,ymax;
getBitmapBBox(alpha, width, height, &xmin,&ymin,&xmax,&ymax);
//xmin = ymin = 0;
//xmax = width;
//ymax = height;
-
+
int rangex = xmax-xmin;
int rangey = ymax-ymin;
gfximage_t*img = (gfximage_t*)malloc(sizeof(gfximage_t));
SplashColorPtr in=&rgb[((y+ymin)*width+xmin)*sizeof(SplashColor)];
gfxcolor_t*out = &img->data[y*rangex];
Guchar*ain = &alpha[(y+ymin)*width+xmin];
- Guchar*ain2 = &alpha2[(y+ymin)*width+xmin];
if(this->emptypage) {
for(x=0;x<rangex;x++) {
/* the first bitmap on the page doesn't need to have an alpha channel-
}
} else {
for(x=0;x<rangex;x++) {
- /*
- if(!ain2[x]) {
- 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).
*/
- 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].a = ain[x];
+ 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].a = ain[x];
}
}
}
this->emptypage = 0;
}
-void writeBitmap(SplashBitmap*bitmap, char*filename)
-{
- int y,x;
-
- int width = bitmap->getWidth();
- int height = bitmap->getHeight();
-
- gfxcolor_t*data = (gfxcolor_t*)malloc(sizeof(gfxcolor_t)*width*height);
-
- for(y=0;y<height;y++) {
- gfxcolor_t*line = &data[y*width];
- for(x=0;x<width;x++) {
- Guchar c[4];
- bitmap->getPixel(x,y,c);
- int a = bitmap->getAlpha(x,y);
- line[x].r = c[0];
- line[x].g = c[1];
- line[x].b = c[2];
- line[x].a = a;
- }
- }
- writePNG(filename, (unsigned char*)data, width, height);
- free(data);
-}
-
void writeAlpha(SplashBitmap*bitmap, char*filename)
{
int y,x;
static const char*STATE_NAME[] = {"parallel", "textabovebitmap", "bitmapabovetext"};
-int checkAlphaSanity(SplashBitmap*boolbtm, SplashBitmap*alphabtm)
-{
- assert(boolbtm->getWidth() == alphabtm->getWidth());
- assert(boolbtm->getHeight() == alphabtm->getHeight());
- if(boolbtm->getMode()==splashModeMono1) {
- return 1;
- }
-
- int width = boolbtm->getWidth();
- int height = boolbtm->getHeight();
-
- int bad=0;
- int x,y;
- for(y=0;y<height;y++) {
- for(x=0;x<width;x++) {
- int a1 = alphabtm->getAlpha(x,y);
- int a2 = boolbtm->getAlpha(x,y);
- if(a1!=a2) {
- bad++;
- }
- }
- }
- double badness = bad/(double)(width*height);
- if(badness>0.2) {
- msg("<error> Bitmaps don't correspond: %d out of %d pixels wrong (%.2f%%)", bad, width*height,
- badness*100.0);
- return 0;
- }
- msg("<notice> %f", badness);
- return 1;
-}
-
-GBool BitmapOutputDev::checkNewText(int x1, int y1, int x2, int y2)
+void BitmapOutputDev::checkNewText()
{
/* called once some new text was drawn on booltextdev, and
before the same thing is drawn on gfxdev */
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%dbitmap_afternewtext.png", dbg_btm_counter);
+ sprintf(filename2, "state%dtext_afternewtext.png", dbg_btm_counter);
if(0) {
- msg("<verbose> %s %s %s", filename1, filename2, filename3);
writeAlpha(boolpolybitmap, filename1);
writeAlpha(booltextbitmap, filename2);
- writeBitmap(rgbdev->getBitmap(), filename3);
}
dbg_btm_counter++;
- GBool ret = false;
- if(intersection(x1,y1,x2,y2)) {
+ if(intersection()) {
if(layerstate==STATE_PARALLEL) {
/* the new text is above the bitmap. So record that fact,
and also clear the bitmap buffer, so we can check for
new intersections */
msg("<verbose> Text is above current bitmap/polygon data");
layerstate=STATE_TEXT_IS_ABOVE;
- clearBoolPolyDev(x1,y1,x2,y2);
+ clearBoolPolyDev();
} else if(layerstate==STATE_BITMAP_IS_ABOVE) {
/* there's a bitmap above the (old) text. So we need
to flush out that text, and record that the *new*
/* clear both bool devices- the text device because
we just dumped out all the (old) text, and the
poly dev so we can check for new intersections */
- clearBoolPolyDev(x1,y1,x2,y2);
- /* FIXME this destroys the text pixels we just
- drew to test for the intersection- however we need
- those to check for the *new* intersections */
- clearBoolTextDev(x1,y1,x2,y2);
- ret = true;
+ clearBoolPolyDev();
+ clearBoolTextDev();
} else {
/* we already know that the current text section is
above the current bitmap section- now just new
the polygon bitmap again, so we can check for
new intersections */
msg("<verbose> Text is still above current bitmap/polygon data");
- clearBoolPolyDev(x1,y1,x2,y2);
+ clearBoolPolyDev();
}
}
- return ret;
}
-GBool BitmapOutputDev::checkNewBitmap(int x1, int y1, int x2, int y2)
+void BitmapOutputDev::checkNewBitmap()
{
/* 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);
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);
-
+ sprintf(filename1, "state%dbitmap_afternewgfx.png", dbg_btm_counter);
+ sprintf(filename2, "state%dtext_afternewgfx.png", dbg_btm_counter);
if(0) {
- msg("<verbose> %s %s %s", filename1, filename2, filename3);
writeAlpha(boolpolybitmap, filename1);
writeAlpha(booltextbitmap, filename2);
- writeBitmap(rgbdev->getBitmap(), filename3);
}
dbg_btm_counter++;
- GBool ret = false;
- if(intersection(x1,y1,x2,y2)) {
+ if(intersection()) {
if(layerstate==STATE_PARALLEL) {
msg("<verbose> Bitmap is above current text data");
layerstate=STATE_BITMAP_IS_ABOVE;
- clearBoolTextDev(x1,y1,x2,y2);
+ clearBoolTextDev();
} else if(layerstate==STATE_TEXT_IS_ABOVE) {
msg("<verbose> Bitmap is above current text data (which is above some bitmap)");
flushBitmap();
layerstate=STATE_BITMAP_IS_ABOVE;
- clearBoolTextDev(x1,y1,x2,y2);
- /* FIXME this destroys the polygon pixels we just
- drew to test for the intersection- however we need
- those to check for the *new* intersections */
- clearBoolPolyDev(x1,y1,x2,y2);
- ret = true;
+ clearBoolTextDev();
+ clearBoolPolyDev();
} else {
msg("<verbose> Bitmap is still above current text data");
- clearBoolTextDev(x1,y1,x2,y2);
+ clearBoolTextDev();
}
}
- return ret;
}
//void checkNewText() {
// break;
//}
-GBool BitmapOutputDev::clip0and1differ(int x1,int y1,int x2,int y2)
+GBool BitmapOutputDev::clip0and1differ()
{
if(clip0bitmap->getMode()==splashModeMono1) {
- if(x2<=x1)
- return gFalse;
- if(x2<0)
- return gFalse;
- if(x1<0)
- x1 = 0;
- if(x1>=clip0bitmap->getWidth())
- return gFalse;
- if(x2>clip0bitmap->getWidth())
- x2=clip0bitmap->getWidth();
-
- if(y2<=y1)
- return gFalse;
- if(y2<0)
- return gFalse;
- if(y1<0)
- y1 = 0;
- if(y1>=clip0bitmap->getHeight())
- return gFalse;
- if(y2>clip0bitmap->getHeight())
- y2=clip0bitmap->getHeight();
-
SplashBitmap*clip0 = clip0bitmap;
SplashBitmap*clip1 = clip1bitmap;
- int width8 = (clip0bitmap->getWidth()+7)/8;
- int height = clip0bitmap->getHeight();
- int x18 = x1/8;
- int x28 = (x2+7)/8;
- int y;
-
- for(y=y1;y<y2;y++) {
- unsigned char*row1 = &clip0bitmap->getDataPtr()[width8*y+x18];
- unsigned char*row2 = &clip1bitmap->getDataPtr()[width8*y+x28];
- if(memcmp(row1, row2, x28-x18))
- return gTrue;
- }
- return gFalse;
+ int width8 = (clip0->getWidth()+7)/8;
+ int height = clip0->getHeight();
+ return memcmp(clip0->getDataPtr(), clip1->getDataPtr(), width8*height);
} else {
SplashBitmap*clip0 = clip0bitmap;
SplashBitmap*clip1 = clip1bitmap;
}
}
-static void clearBooleanBitmap(SplashBitmap*btm, int x1, int y1, int x2, int y2)
+static void clearBooleanBitmap(SplashBitmap*btm)
{
- if(!(x1|y1|x2|y2)) {
- x1 = y1 = 0;
- x2 = btm->getWidth();
- y2 = btm->getHeight();
- }
if(btm->getMode()==splashModeMono1) {
int width8 = (btm->getWidth()+7)/8;
int width = btm->getWidth();
return c;
}
-GBool BitmapOutputDev::intersection(int x1, int y1, int x2, int y2)
+GBool BitmapOutputDev::intersection()
{
SplashBitmap*boolpoly = boolpolybitmap;
SplashBitmap*booltext = booltextbitmap;
Guchar*polypixels = boolpoly->getDataPtr();
Guchar*textpixels = booltext->getDataPtr();
-
+
int width8 = (width+7)/8;
int height = boolpoly->getHeight();
- if(x1|y1|x2|y2) {
- if(y1>=0 && y1<=y2 && y2<=height) {
- polypixels+=y1*width8;
- textpixels+=y1*width8;
- height=y2-y1;
- }
- }
-
int t;
int len = height*width8;
unsigned long long int c=0;
assert(sizeof(unsigned long long int)==8);
{
- if(((int)polypixels&7) || ((int)textpixels&7)) {
- //msg("<warning> Non-optimal alignment");
+ if((polypixels&7) || (textpixels&7)) {
+ msg("<warning> Non-optimal alignment");
}
int l2 = len;
len /= sizeof(unsigned long long int);
/* just in case any device did draw a white background rectangle
into the device */
- clearBoolTextDev(UNKNOWN_BOUNDING_BOX);
- clearBoolPolyDev(UNKNOWN_BOUNDING_BOX);
+ clearBoolTextDev();
+ clearBoolPolyDev();
this->layerstate = STATE_PARALLEL;
this->emptypage = 1;
clip1dev->updateTransfer(state);
gfxdev->updateTransfer(state);
}
-
void BitmapOutputDev::updateFont(GfxState *state)
{
boolpolydev->updateFont(state);
{
msg("<debug> stroke");
boolpolydev->stroke(state);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->stroke(state);
}
void BitmapOutputDev::fill(GfxState *state)
{
msg("<debug> fill");
boolpolydev->fill(state);
- if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
- boolpolydev->fill(state);
- }
+ checkNewBitmap();
rgbdev->fill(state);
}
void BitmapOutputDev::eoFill(GfxState *state)
{
msg("<debug> eoFill");
boolpolydev->eoFill(state);
- if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
- boolpolydev->eoFill(state);
- }
+ checkNewBitmap();
rgbdev->eoFill(state);
}
#if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
{
msg("<debug> tilingPatternFill");
boolpolydev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->tilingPatternFill(state, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
}
#else
{
msg("<debug> tilingPatternFill");
boolpolydev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
}
#endif
{
msg("<debug> functionShadedFill");
boolpolydev->functionShadedFill(state, shading);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
return rgbdev->functionShadedFill(state, shading);
}
GBool BitmapOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading)
{
msg("<debug> axialShadedFill");
boolpolydev->axialShadedFill(state, shading);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
return rgbdev->axialShadedFill(state, shading);
}
GBool BitmapOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading)
{
msg("<debug> radialShadedFill");
boolpolydev->radialShadedFill(state, shading);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
return rgbdev->radialShadedFill(state, shading);
}
clip0dev->endStringOp(state);
clip1dev->endStringOp(state);
booltextdev->endStringOp(state);
- checkNewText(UNKNOWN_BOUNDING_BOX);
+ checkNewText();
gfxdev->endStringOp(state);
}
void BitmapOutputDev::beginString(GfxState *state, GString *s)
clip0dev->endString(state);
clip1dev->endString(state);
booltextdev->endString(state);
- checkNewText(UNKNOWN_BOUNDING_BOX);
+ checkNewText();
gfxdev->endString(state);
}
void BitmapOutputDev::clearClips()
{
- clearBooleanBitmap(clip0bitmap, 0, 0, 0, 0);
- clearBooleanBitmap(clip1bitmap, 0, 0, 0, 0);
+ clearBooleanBitmap(clip0bitmap);
+ clearBooleanBitmap(clip1bitmap);
}
-void BitmapOutputDev::clearBoolPolyDev(int x1, int y1, int x2, int y2)
+void BitmapOutputDev::clearBoolPolyDev()
{
- clearBooleanBitmap(boolpolybitmap, x1, y1, x2, y2);
+ clearBooleanBitmap(boolpolybitmap);
}
-void BitmapOutputDev::clearBoolTextDev(int x1, int y1, int x2, int y2)
+void BitmapOutputDev::clearBoolTextDev()
{
- clearBooleanBitmap(booltextbitmap, x1, y1, x2, y2);
+ clearBooleanBitmap(booltextbitmap);
}
void BitmapOutputDev::drawChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
CharCode code, int nBytes, Unicode *u, int uLen)
{
- msg("<debug> drawChar render=%d", state->getRender());
-
+ msg("<debug> drawChar");
if(state->getRender()&RENDER_CLIP) {
rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
-
- /* FIXME: do we need these calls? */
- boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
- booltextdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
- clip1dev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
} else {
clearClips();
clip0dev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
clip1dev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
-
- /* calculate the bbox of this character */
- int x1 = (int)x, x2 = (int)x+1, y1 = (int)y, y2 = (int)y+1;
- SplashPath*path = clip0dev->getCurrentFont()->getGlyphPath(code);
- int t;
- for(t=0;t<path->getLength();t++) {
- double xx,yy;
- Guchar f;
- path->getPoint(t,&xx,&yy,&f);
- xx+=x;
- yy+=y;
- 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 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
text */
- if(clip0and1differ(x1,y1,x2,y2)) {
+ if(clip0and1differ()) {
msg("<verbose> Char %d is affected by clipping", code);
boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
if(config_extrafontdata) {
int oldrender = state->getRender();
/* this char is not at all affected by clipping.
Now just dump out the bitmap we're currently working on, if necessary. */
booltextdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
- checkNewText(x1,y1,x2,y2);
+ checkNewText();
/* use polygonal output device to do the actual text handling */
gfxdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
}
clip0dev->endTextObject(state);
clip1dev->endTextObject(state);
booltextdev->endTextObject(state);
- /* TODO: do this only if rendermode!=0 */
- checkNewText(UNKNOWN_BOUNDING_BOX);
+ checkNewText();
gfxdev->endTextObject(state);
}
str = cpystr->getStream();
}
boolpolydev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
if(cpystr)
delete cpystr;
str = cpystr->getStream();
}
boolpolydev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
if(cpystr)
delete cpystr;
{
msg("<debug> drawMaskedImage streamkind=%d", str->getKind());
boolpolydev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
}
void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
{
msg("<debug> drawSoftMaskedImage %dx%d (%dx%d) streamkind=%d", width, height, maskWidth, maskHeight, str->getKind());
boolpolydev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap);
}
void BitmapOutputDev::drawForm(Ref id)
{
msg("<debug> drawForm");
boolpolydev->drawForm(id);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->drawForm(id);
}
GfxState*state2 = state->copy(gTrue);
#endif
boolpolydev->endTransparencyGroup(state1);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->endTransparencyGroup(state2);
delete state1;
delete state2;
{
msg("<debug> paintTransparencyGroup");
boolpolydev->paintTransparencyGroup(state,bbox);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->paintTransparencyGroup(state,bbox);
clip1dev->paintTransparencyGroup(state,bbox);
}
{
msg("<debug> setSoftMask");
boolpolydev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
clip1dev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
}
{
msg("<debug> clearSoftMask");
boolpolydev->clearSoftMask(state);
- checkNewBitmap(UNKNOWN_BOUNDING_BOX);
+ checkNewBitmap();
rgbdev->clearSoftMask(state);
clip1dev->clearSoftMask(state);
}
git.asbjorn.biz / swftools.git / commitdiff