#include <stdlib.h>
#include <stdio.h>
#include <memory.h>
+#include <assert.h>
#include "config.h"
#include "BitmapOutputDev.h"
#include "GFXOutputDev.h"
#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};
int width = rgbdev->getBitmapWidth();
int height = rgbdev->getBitmapHeight();
- SplashColorPtr rgb = rgbdev->getBitmap()->getDataPtr();
- Guchar*alpha = rgbdev->getBitmap()->getAlphaPtr();
+ 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];
- for(x=0;x<rangex;x++) {
- /* 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];
+ 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-
+ blend against a white background*/
+ out[x].r = (in[x*3+0]*ain[x])/255 + 255-ain[x];
+ out[x].g = (in[x*3+1]*ain[x])/255 + 255-ain[x];
+ out[x].b = (in[x*3+2]*ain[x])/255 + 255-ain[x];
+ out[x].a = 255;
+ }
+ } 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];
+ }
}
}
/* transform bitmap rectangle to "device space" */
m.ty = ymin;
m.m00 = m.m11 = 1;
m.m10 = m.m01 = 0;
+ m.tx -= 0.5;
+ m.ty -= 0.5;
gfxline_t* line = gfxline_makerectangle(xmin, ymin, xmax, ymax);
dev->fillbitmap(dev, line, img, &m, 0);
gfxline_free(line);
- memset(rgbdev->getBitmap()->getAlphaPtr(), 0, rgbdev->getBitmap()->getWidth()*rgbdev->getBitmap()->getHeight());
- memset(rgbdev->getBitmap()->getDataPtr(), 0, rgbdev->getBitmap()->getRowSize()*rgbdev->getBitmap()->getHeight());
+ memset(rgbbitmap->getAlphaPtr(), 0, rgbbitmap->getWidth()*rgbbitmap->getHeight());
+ memset(rgbbitmap->getDataPtr(), 0, rgbbitmap->getRowSize()*rgbbitmap->getHeight());
free(img->data);img->data=0;free(img);img=0;
+
+ this->emptypage = 0;
}
void BitmapOutputDev::flushText()
{
msg("<verbose> Flushing text/polygons");
gfxdevice_record_flush(this->gfxoutput, this->dev);
+
+ 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)
{
- return;
int y,x;
int width = bitmap->getWidth();
}
static int dbg_btm_counter=1;
-void BitmapOutputDev::checkNewText()
+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)
{
/* 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=%d, counter=%d\n", layerstate, dbg_btm_counter);
+ msg("<trace> Testing new text data against current bitmap data, state=%s, counter=%d\n", STATE_NAME[layerstate], dbg_btm_counter);
char filename1[80];
char filename2[80];
- sprintf(filename1, "state%dbitmap_newtext.png", dbg_btm_counter);
- sprintf(filename2, "state%dtext_newtext.png", dbg_btm_counter);
- writeAlpha(boolpolydev->getBitmap(), filename1);
- writeAlpha(booltextdev->getBitmap(), filename2);
+ 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);
+ if(0) {
+ msg("<verbose> %s %s %s", filename1, filename2, filename3);
+ writeAlpha(boolpolybitmap, filename1);
+ writeAlpha(booltextbitmap, filename2);
+ writeBitmap(rgbdev->getBitmap(), filename3);
+ }
dbg_btm_counter++;
- if(intersection()) {
- msg("<verbose> Text is above current bitmap/polygon data");
+ GBool ret = false;
+ if(intersection(x1,y1,x2,y2)) {
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();
+ clearBoolPolyDev(x1,y1,x2,y2);
} 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*
text is now *above* the bitmap
*/
+ msg("<verbose> Text is above current bitmap/polygon data (which is above some other text)");
flushText();
layerstate=STATE_TEXT_IS_ABOVE;
/* 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();
- clearBoolTextDev();
+ 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;
} else {
/* we already know that the current text section is
above the current bitmap section- now just new
*again* it's above the current bitmap- so clear
the polygon bitmap again, so we can check for
new intersections */
- clearBoolPolyDev();
+ msg("<verbose> Text is still above current bitmap/polygon data");
+ clearBoolPolyDev(x1,y1,x2,y2);
}
}
+ return ret;
}
-void BitmapOutputDev::checkNewBitmap()
+GBool BitmapOutputDev::checkNewBitmap(int x1, int y1, int x2, int y2)
{
/* similar to checkNewText() above, only in reverse */
- msg("<trace> Testing new graphics data against current text data, state=%d, counter=%d\n", layerstate, dbg_btm_counter);
+ 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];
- sprintf(filename1, "state%dbitmap_newbitmap.png", dbg_btm_counter);
- sprintf(filename2, "state%dtext_newbitmap.png", dbg_btm_counter);
- writeAlpha(boolpolydev->getBitmap(), filename1);
- writeAlpha(booltextdev->getBitmap(), filename2);
+ 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);
+
+ if(0) {
+ msg("<verbose> %s %s %s", filename1, filename2, filename3);
+ writeAlpha(boolpolybitmap, filename1);
+ writeAlpha(booltextbitmap, filename2);
+ writeBitmap(rgbdev->getBitmap(), filename3);
+ }
dbg_btm_counter++;
- if(intersection()) {
- msg("<verbose> Bitmap is above current text data");
+ GBool ret = false;
+ if(intersection(x1,y1,x2,y2)) {
if(layerstate==STATE_PARALLEL) {
+ msg("<verbose> Bitmap is above current text data");
layerstate=STATE_BITMAP_IS_ABOVE;
- clearBoolTextDev();
+ clearBoolTextDev(x1,y1,x2,y2);
} 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();
- clearBoolPolyDev();
+ 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;
} else {
- clearBoolTextDev();
+ msg("<verbose> Bitmap is still above current text data");
+ clearBoolTextDev(x1,y1,x2,y2);
}
}
+ return ret;
}
//void checkNewText() {
-// Guchar*alpha = rgbdev->getBitmap()->getAlphaPtr();
-// Guchar*charpixels = clip1dev->getBitmap()->getDataPtr();
+// Guchar*alpha = rgbbitmap->getAlphaPtr();
+// Guchar*charpixels = clip1bitmap->getDataPtr();
// int xx,yy;
// for(yy=0;yy<height;yy++) {
// Guchar*aline = &alpha[yy*width];
// break;
//}
-GBool BitmapOutputDev::clip0and1differ()
+GBool BitmapOutputDev::clip0and1differ(int x1,int y1,int x2,int y2)
{
- if(clip0dev->getBitmap()->getMode()==splashModeMono1) {
- SplashBitmap*clip0 = clip0dev->getBitmap();
- SplashBitmap*clip1 = clip1dev->getBitmap();
- int width8 = (clip0->getWidth()+7)/8;
- int height = clip0->getHeight();
- return memcmp(clip0->getDataPtr(), clip1->getDataPtr(), width8*height);
+ 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;
} else {
- SplashBitmap*clip0 = clip0dev->getBitmap();
- SplashBitmap*clip1 = clip1dev->getBitmap();
+ SplashBitmap*clip0 = clip0bitmap;
+ SplashBitmap*clip1 = clip1bitmap;
int width = clip0->getAlphaRowSize();
int height = clip0->getHeight();
return memcmp(clip0->getAlphaPtr(), clip1->getAlphaPtr(), width*height);
}
}
-static void clearBooleanDev(SplashOutputDev*dev)
+static void clearBooleanBitmap(SplashBitmap*btm, int x1, int y1, int x2, int y2)
{
- SplashBitmap*btm = dev->getBitmap();
+ 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();
}
}
-GBool BitmapOutputDev::intersection()
+long long unsigned int compare64(long long unsigned int*data1, long long unsigned int*data2, int len)
{
- SplashBitmap*boolpoly = boolpolydev->getBitmap();
- SplashBitmap*booltext = booltextdev->getBitmap();
+ long long unsigned int c;
+ int t;
+ for(t=0;t<len;t++) {
+ c |= data1[t]&data2[t];
+ }
+ return c;
+}
+
+GBool BitmapOutputDev::intersection(int x1, int y1, int x2, int y2)
+{
+ SplashBitmap*boolpoly = boolpolybitmap;
+ SplashBitmap*booltext = booltextbitmap;
if(boolpoly->getMode()==splashModeMono1) {
/* alternative implementation, using one bit per pixel-
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 int c=0;
- if(len & (sizeof(unsigned int)-1)) {
- Guchar c2=0;
- for(t=0;t<len;t++) {
- c2 |= polypixels[t]&textpixels[t];
- }
- c = c2;
- } else {
- len /= sizeof(unsigned int);
- for(t=0;t<len;t++) {
- c |= (((unsigned int*)polypixels)[t]) & (((unsigned int*)textpixels)[t]);
+ 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");
+ }
+ int l2 = len;
+ len /= sizeof(unsigned long long int);
+ c = compare64((unsigned long long int*)polypixels, (unsigned long long int*)textpixels, len);
+ int l1 = len*sizeof(unsigned long long int);
+ for(t=l1;t<l2;t++) {
+ c |= (unsigned long long int)(polypixels[t]&textpixels[t]);
}
}
if(c)
clip1dev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
gfxdev->startPage(pageNum, state, crop_x1, crop_y1, crop_x2, crop_y2);
+ boolpolybitmap = boolpolydev->getBitmap();
+ booltextbitmap = booltextdev->getBitmap();
+ clip0bitmap = clip0dev->getBitmap();
+ clip1bitmap = clip1dev->getBitmap();
+ rgbbitmap = rgbdev->getBitmap();
+
flushText(); // write out the initial clipping rectangle
/* just in case any device did draw a white background rectangle
into the device */
- clearBoolTextDev();
- clearBoolPolyDev();
+ clearBoolTextDev(UNKNOWN_BOUNDING_BOX);
+ clearBoolPolyDev(UNKNOWN_BOUNDING_BOX);
this->layerstate = STATE_PARALLEL;
+ this->emptypage = 1;
+ msg("<debug> startPage done");
}
void BitmapOutputDev::endPage()
{
msg("<verbose> endPage (BitmapOutputDev)");
+
+ /* notice: we're not fully done yet with this page- there might still be
+ a few calls to drawLink() yet to come */
+}
+void BitmapOutputDev::finishPage()
+{
+ msg("<verbose> finishPage (BitmapOutputDev)");
+ gfxdev->endPage();
if(layerstate == STATE_BITMAP_IS_ABOVE) {
this->flushText();
rgbdev->endPage();
clip0dev->endPage();
clip1dev->endPage();
- gfxdev->endPage();
}
GBool BitmapOutputDev::upsideDown()
clip1dev->updateTransfer(state);
gfxdev->updateTransfer(state);
}
+
void BitmapOutputDev::updateFont(GfxState *state)
{
boolpolydev->updateFont(state);
{
msg("<debug> stroke");
boolpolydev->stroke(state);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->stroke(state);
}
void BitmapOutputDev::fill(GfxState *state)
{
msg("<debug> fill");
boolpolydev->fill(state);
- checkNewBitmap();
+ if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
+ boolpolydev->fill(state);
+ }
rgbdev->fill(state);
}
void BitmapOutputDev::eoFill(GfxState *state)
{
msg("<debug> eoFill");
boolpolydev->eoFill(state);
- checkNewBitmap();
+ if(checkNewBitmap(UNKNOWN_BOUNDING_BOX)) {
+ boolpolydev->eoFill(state);
+ }
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();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
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();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->tilingPatternFill(state, gfx, str, paintType, resDict, mat, bbox, x0, y0, x1, y1, xStep, yStep);
}
#endif
{
msg("<debug> functionShadedFill");
boolpolydev->functionShadedFill(state, shading);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
return rgbdev->functionShadedFill(state, shading);
}
GBool BitmapOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading)
{
msg("<debug> axialShadedFill");
boolpolydev->axialShadedFill(state, shading);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
return rgbdev->axialShadedFill(state, shading);
}
GBool BitmapOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading)
{
msg("<debug> radialShadedFill");
boolpolydev->radialShadedFill(state, shading);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
return rgbdev->radialShadedFill(state, shading);
}
clip0dev->endStringOp(state);
clip1dev->endStringOp(state);
booltextdev->endStringOp(state);
- checkNewText();
+ checkNewText(UNKNOWN_BOUNDING_BOX);
gfxdev->endStringOp(state);
}
void BitmapOutputDev::beginString(GfxState *state, GString *s)
clip0dev->endString(state);
clip1dev->endString(state);
booltextdev->endString(state);
- checkNewText();
+ checkNewText(UNKNOWN_BOUNDING_BOX);
gfxdev->endString(state);
}
void BitmapOutputDev::clearClips()
{
- clearBooleanDev(clip0dev);
- clearBooleanDev(clip1dev);
+ clearBooleanBitmap(clip0bitmap, 0, 0, 0, 0);
+ clearBooleanBitmap(clip1bitmap, 0, 0, 0, 0);
}
-void BitmapOutputDev::clearBoolPolyDev()
+void BitmapOutputDev::clearBoolPolyDev(int x1, int y1, int x2, int y2)
{
- clearBooleanDev(boolpolydev);
+ clearBooleanBitmap(boolpolybitmap, x1, y1, x2, y2);
}
-void BitmapOutputDev::clearBoolTextDev()
+void BitmapOutputDev::clearBoolTextDev(int x1, int y1, int x2, int y2)
{
- clearBooleanDev(booltextdev);
+ clearBooleanBitmap(booltextbitmap, x1, y1, x2, y2);
}
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");
- if(state->getRender()&4 /*clip*/ ) {
+ msg("<debug> drawChar render=%d", state->getRender());
+
+ if(state->getRender()&RENDER_CLIP) {
+ //char is just a clipping boundary
+ rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+ 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 if(rgbbitmap != rgbdev->getBitmap()) {
+ // we're doing softmasking or transparency grouping
+ boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
} else {
+ // we're drawing a regular char
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()) {
+ if(clip0and1differ(x1,y1,x2,y2)) {
msg("<verbose> Char %d is affected by clipping", code);
boolpolydev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
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();
+ checkNewText(x1,y1,x2,y2);
/* use polygonal output device to do the actual text handling */
gfxdev->drawChar(state, x, y, dx, dy, originX, originY, code, nBytes, u, uLen);
}
void BitmapOutputDev::endTextObject(GfxState *state)
{
msg("<debug> endTextObject");
+ rgbdev->endTextObject(state);
clip0dev->endTextObject(state);
clip1dev->endTextObject(state);
booltextdev->endTextObject(state);
- checkNewText();
+ /* TODO: do this only if rendermode!=0 */
+ checkNewText(UNKNOWN_BOUNDING_BOX);
gfxdev->endTextObject(state);
}
msg("<debug> endType3Char");
gfxdev->endType3Char(state);
}
+
+class CopyStream: public Object
+{
+ Dict*dict;
+ char*buf;
+ MemStream*memstream;
+ public:
+ CopyStream(Stream*str, int len)
+ {
+ buf = 0;
+ str->reset();
+ if(len) {
+ buf = (char*)malloc(len);
+ int t;
+ for (t=0; t<len; t++)
+ buf[t] = str->getChar();
+ }
+ str->close();
+ this->dict = str->getDict();
+ this->memstream = new MemStream(buf, 0, len, this);
+ }
+ ~CopyStream()
+ {
+ ::free(this->buf);this->buf = 0;
+ delete this->memstream;
+ }
+ Dict* getDict() {return dict;}
+ Stream* getStream() {return this->memstream;};
+};
+
void BitmapOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,
GBool inlineImg)
{
- msg("<debug> drawImageMask");
+ msg("<debug> drawImageMask streamkind=%d", str->getKind());
+ CopyStream*cpystr = 0;
+ if(inlineImg) {
+ cpystr = new CopyStream(str, height * ((width + 7) / 8));
+ str = cpystr->getStream();
+ }
boolpolydev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->drawImageMask(state, ref, str, width, height, invert, inlineImg);
+ if(cpystr)
+ delete cpystr;
}
void BitmapOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
int *maskColors, GBool inlineImg)
{
- msg("<debug> drawImage");
+ msg("<debug> 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();
+ }
boolpolydev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+ if(cpystr)
+ delete cpystr;
}
void BitmapOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
Stream *maskStr, int maskWidth, int maskHeight,
GBool maskInvert)
{
- msg("<debug> drawMaskedImage");
+ msg("<debug> drawMaskedImage streamkind=%d", str->getKind());
boolpolydev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->drawMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskInvert);
}
void BitmapOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
int maskWidth, int maskHeight,
GfxImageColorMap *maskColorMap)
{
- msg("<debug> drawSoftMaskedImage");
+ 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();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->drawSoftMaskedImage(state, ref, str, width, height, colorMap, maskStr, maskWidth, maskHeight, maskColorMap);
}
void BitmapOutputDev::drawForm(Ref id)
{
msg("<debug> drawForm");
boolpolydev->drawForm(id);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->drawForm(id);
}
GBool forSoftMask)
{
msg("<debug> beginTransparencyGroup");
+#if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
+ GfxState*state1 = state->copy();
+ GfxState*state2 = state->copy();
+ state1->setPath(0);
+ state1->setPath(state->getPath()->copy());
+ state2->setPath(0);
+ state2->setPath(state->getPath()->copy());
+#else
GfxState*state1 = state->copy(gTrue);
GfxState*state2 = state->copy(gTrue);
+#endif
boolpolydev->beginTransparencyGroup(state1, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
rgbdev->beginTransparencyGroup(state2, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
clip1dev->beginTransparencyGroup(state, bbox, blendingColorSpace, isolated, knockout, forSoftMask);
void BitmapOutputDev::endTransparencyGroup(GfxState *state)
{
msg("<debug> endTransparencyGroup");
+#if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
+ GfxState*state1 = state->copy();
+ GfxState*state2 = state->copy();
+ state1->setPath(0);
+ state1->setPath(state->getPath()->copy());
+ state2->setPath(0);
+ state2->setPath(state->getPath()->copy());
+#else
GfxState*state1 = state->copy(gTrue);
GfxState*state2 = state->copy(gTrue);
+#endif
boolpolydev->endTransparencyGroup(state1);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->endTransparencyGroup(state2);
delete state1;
delete state2;
{
msg("<debug> paintTransparencyGroup");
boolpolydev->paintTransparencyGroup(state,bbox);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->paintTransparencyGroup(state,bbox);
clip1dev->paintTransparencyGroup(state,bbox);
}
{
msg("<debug> setSoftMask");
boolpolydev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
clip1dev->setSoftMask(state, bbox, alpha, transferFunc, backdropColor);
}
{
msg("<debug> clearSoftMask");
boolpolydev->clearSoftMask(state);
- checkNewBitmap();
+ checkNewBitmap(UNKNOWN_BOUNDING_BOX);
rgbdev->clearSoftMask(state);
clip1dev->clearSoftMask(state);
}
git.asbjorn.biz / swftools.git / blobdiff