summaryrefslogtreecommitdiff
path: root/fitz
diff options
context:
space:
mode:
Diffstat (limited to 'fitz')
-rw-r--r--fitz/dev_draw.c173
-rw-r--r--fitz/dev_trace.c22
-rw-r--r--fitz/fitz_base.h13
-rw-r--r--fitz/fitz_res.h6
4 files changed, 187 insertions, 27 deletions
diff --git a/fitz/dev_draw.c b/fitz/dev_draw.c
index 92663a5c..1285ae51 100644
--- a/fitz/dev_draw.c
+++ b/fitz/dev_draw.c
@@ -16,6 +16,42 @@ struct fz_drawdevice_s
fz_pixmap *dest;
};
+static void
+blendover(fz_pixmap *src, fz_pixmap *dst)
+{
+ unsigned char *sp, *dp;
+ fz_irect sr, dr;
+ int x, y, w, h;
+
+ sr.x0 = src->x;
+ sr.y0 = src->y;
+ sr.x1 = src->x + src->w;
+ sr.y1 = src->y + src->h;
+
+ dr.x0 = dst->x;
+ dr.y0 = dst->y;
+ dr.x1 = dst->x + dst->w;
+ dr.y1 = dst->y + dst->h;
+
+ dr = fz_intersectirects(sr, dr);
+ x = dr.x0;
+ y = dr.y0;
+ w = dr.x1 - dr.x0;
+ h = dr.y1 - dr.y0;
+
+ sp = src->samples + ((y - src->y) * src->w + (x - src->x)) * src->n;
+ dp = dst->samples + ((y - dst->y) * dst->w + (x - dst->x)) * dst->n;
+
+ if (src->n == 1 && dst->n == 1)
+ fz_duff_1o1(sp, src->w, dp, dst->w, w, h);
+ else if (src->n == 4 && dst->n == 4)
+ fz_duff_4o4(sp, src->w * 4, dp, dst->w * 4, w, h);
+ else if (src->n == dst->n)
+ fz_duff_non(sp, src->w * src->n, src->n, dp, dst->w * dst->n, w, h);
+ else
+ assert(!"blendover src and dst mismatch");
+}
+
void fz_drawfillpath(void *user, fz_path *path, fz_colorspace *colorspace, float *color, float alpha)
{
fz_drawdevice *dev = user;
@@ -207,19 +243,146 @@ void fz_drawignoretext(void *user, fz_text *text)
printf("invisibletext\n");
}
-void fz_drawdrawimage(void *user, fz_image *image, fz_matrix *ctm)
+static inline void
+calcimagescale(fz_matrix ctm, int w, int h, int *odx, int *ody)
{
- printf("drawimage\n");
+ float sx, sy;
+ int dx, dy;
+
+ sx = sqrt(ctm.a * ctm.a + ctm.b * ctm.b);
+ dx = 1;
+ while (((w+dx-1)/dx)/sx > 2.0 && (w+dx-1)/dx > 1)
+ dx++;
+
+ sy = sqrt(ctm.c * ctm.c + ctm.d * ctm.d);
+ dy = 1;
+ while (((h+dy-1)/dy)/sy > 2.0 && (h+dy-1)/dy > 1)
+ dy++;
+
+ *odx = dx;
+ *ody = dy;
+}
+
+void fz_drawdrawshade(void *user, fz_shade *shade, fz_matrix ctm)
+{
+ fz_drawdevice *dev = user;
+ fz_rect bounds;
+ fz_irect bbox;
+ fz_irect clip;
+ fz_pixmap *tmp;
+
+ bounds = fz_transformaabb(fz_concat(shade->matrix, ctm), shade->bbox);
+ bbox = fz_roundrect(bounds);
+
+ clip.x0 = dev->dest->x;
+ clip.y0 = dev->dest->y;
+ clip.x1 = dev->dest->x + dev->dest->w;
+ clip.y1 = dev->dest->y + dev->dest->h;
+ clip = fz_intersectirects(clip, bbox);
+
+ tmp = fz_newpixmapwithrect(clip, dev->model->n + 1);
+ fz_rendershade(shade, ctm, dev->model, tmp);
+ blendover(tmp, dev->dest);
+ fz_freepixmap(tmp);
}
-void fz_drawdrawshade(void *user, fz_shade *shade, fz_matrix *ctm)
+void fz_drawdrawimage(void *user, fz_image *image, fz_matrix ctm)
{
- printf("drawshade\n");
+ fz_drawdevice *dev = user;
+ fz_error error;
+ fz_rect bounds;
+ fz_irect bbox;
+ fz_irect clip;
+ int dx, dy;
+ fz_pixmap *tile;
+ fz_pixmap *temp;
+ fz_matrix imgmat;
+ fz_matrix invmat;
+ int fa, fb, fc, fd;
+ int u0, v0;
+ int x0, y0;
+ int w, h;
+
+ printf("drawimage\n");
+
+ bounds.x0 = 0;
+ bounds.y0 = 0;
+ bounds.x1 = 1;
+ bounds.y1 = 1;
+ bounds = fz_transformaabb(ctm, bounds);
+ bbox = fz_roundrect(bounds);
+
+ clip.x0 = dev->dest->x;
+ clip.y0 = dev->dest->y;
+ clip.x1 = dev->dest->x + dev->dest->w;
+ clip.y1 = dev->dest->y + dev->dest->h;
+ clip = fz_intersectirects(clip, bbox);
+
+ if (fz_isemptyrect(clip))
+ return;
+ if (image->w == 0 || image->h == 0)
+ return;
+
+ calcimagescale(ctm, image->w, image->h, &dx, &dy);
+
+ tile = fz_newpixmap(0, 0, image->w, image->h, image->n + 1);
+
+ error = image->loadtile(image, tile);
+ if (error)
+ {
+ fz_catch(error, "cannot load image data");
+ return;
+ }
+
+ if (dx != 1 || dy != 1)
+ {
+ temp = fz_scalepixmap(tile, dx, dy);
+ fz_freepixmap(tile);
+ tile = temp;
+ }
+
+ if (image->cs && image->cs != dev->model)
+ {
+ temp = fz_newpixmap(tile->x, tile->y, tile->w, tile->h, dev->model->n + 1);
+ fz_convertpixmap(image->cs, tile, dev->model, temp);
+ fz_freepixmap(tile);
+ tile = temp;
+ }
+
+ imgmat.a = 1.0 / tile->w;
+ imgmat.b = 0.0;
+ imgmat.c = 0.0;
+ imgmat.d = -1.0 / tile->h;
+ imgmat.e = 0.0;
+ imgmat.f = 1.0;
+ invmat = fz_invertmatrix(fz_concat(imgmat, ctm));
+
+ invmat.e -= 0.5;
+ invmat.f -= 0.5;
+
+ w = clip.x1 - clip.x0;
+ h = clip.y1 - clip.y0;
+ x0 = clip.x0;
+ y0 = clip.y0;
+ u0 = (invmat.a * (x0+0.5) + invmat.c * (y0+0.5) + invmat.e) * 65536;
+ v0 = (invmat.b * (x0+0.5) + invmat.d * (y0+0.5) + invmat.f) * 65536;
+ fa = invmat.a * 65536;
+ fb = invmat.b * 65536;
+ fc = invmat.c * 65536;
+ fd = invmat.d * 65536;
+
+#define PDST(p) p->samples + ((y0-p->y) * p->w + (x0-p->x)) * p->n, p->w * p->n
+
+ if (image->cs)
+ fz_img_4o4(tile->samples, tile->w, tile->h, PDST(dev->dest),
+ u0, v0, fa, fb, fc, fd, w, h);
+
+ fz_freepixmap(tile);
}
void fz_drawpopclip(void *user)
{
- printf("grestore\n");
+ printf("popclip\n");
}
fz_device *fz_newdrawdevice(fz_colorspace *colorspace, fz_pixmap *dest)
diff --git a/fitz/dev_trace.c b/fitz/dev_trace.c
index 85118e1b..4816bf10 100644
--- a/fitz/dev_trace.c
+++ b/fitz/dev_trace.c
@@ -1,9 +1,9 @@
#include "fitz.h"
-static void fz_tracematrix(fz_matrix *ctm)
+static void fz_tracematrix(fz_matrix ctm)
{
printf("%g %g %g %g %g %g setmatrix\n",
- ctm->a, ctm->b, ctm->c, ctm->d, ctm->e, ctm->f);
+ ctm.a, ctm.b, ctm.c, ctm.d, ctm.e, ctm.f);
}
static void fz_tracecolor(fz_colorspace *colorspace, float *color, float alpha)
@@ -14,7 +14,7 @@ static void fz_tracecolor(fz_colorspace *colorspace, float *color, float alpha)
void fz_tracefillpath(void *user, fz_path *path, fz_colorspace *colorspace, float *color, float alpha)
{
- fz_tracematrix(&path->ctm);
+ fz_tracematrix(path->ctm);
fz_printpath(path, 0);
if (path->winding == FZ_EVENODD)
printf("eofill\n");
@@ -27,7 +27,7 @@ void fz_tracestrokepath(void *user, fz_path *path, fz_colorspace *colorspace, fl
int i;
fz_tracecolor(colorspace, color, alpha);
- fz_tracematrix(&path->ctm);
+ fz_tracematrix(path->ctm);
printf("%g setlinewidth\n", path->linewidth);
printf("%g setmiterlimit\n", path->miterlimit);
@@ -50,7 +50,7 @@ void fz_tracestrokepath(void *user, fz_path *path, fz_colorspace *colorspace, fl
void fz_traceclippath(void *user, fz_path *path)
{
printf("gsave\n");
- fz_tracematrix(&path->ctm);
+ fz_tracematrix(path->ctm);
fz_printpath(path, 0);
if (path->winding == FZ_EVENODD)
printf("eoclip\n");
@@ -61,7 +61,7 @@ void fz_traceclippath(void *user, fz_path *path)
void fz_tracefilltext(void *user, fz_text *text, fz_colorspace *colorspace, float *color, float alpha)
{
printf("/%s setfont\n", text->font->name);
- fz_tracematrix(&text->trm);
+ fz_tracematrix(text->trm);
fz_debugtext(text, 0);
printf("show\n");
}
@@ -69,7 +69,7 @@ void fz_tracefilltext(void *user, fz_text *text, fz_colorspace *colorspace, floa
void fz_tracestroketext(void *user, fz_text *text, fz_colorspace *colorspace, float *color, float alpha)
{
printf("/%s setfont\n", text->font->name);
- fz_tracematrix(&text->trm);
+ fz_tracematrix(text->trm);
fz_debugtext(text, 0);
printf("charpath stroke\n");
}
@@ -78,7 +78,7 @@ void fz_tracecliptext(void *user, fz_text *text)
{
printf("gsave\n");
printf("/%s setfont\n", text->font->name);
- fz_tracematrix(&text->trm);
+ fz_tracematrix(text->trm);
fz_debugtext(text, 0);
printf("charpath clip\n");
}
@@ -86,18 +86,18 @@ void fz_tracecliptext(void *user, fz_text *text)
void fz_traceignoretext(void *user, fz_text *text)
{
printf("/%s setfont\n", text->font->name);
- fz_tracematrix(&text->trm);
+ fz_tracematrix(text->trm);
fz_debugtext(text, 0);
printf("invisibletext\n");
}
-void fz_tracedrawimage(void *user, fz_image *image, fz_matrix *ctm)
+void fz_tracedrawimage(void *user, fz_image *image, fz_matrix ctm)
{
fz_tracematrix(ctm);
printf("drawimage\n");
}
-void fz_tracedrawshade(void *user, fz_shade *shade, fz_matrix *ctm)
+void fz_tracedrawshade(void *user, fz_shade *shade, fz_matrix ctm)
{
fz_tracematrix(ctm);
printf("drawshade\n");
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h
index 46556a01..10ec702e 100644
--- a/fitz/fitz_base.h
+++ b/fitz/fitz_base.h
@@ -307,21 +307,18 @@ struct fz_pixmap_s
fz_sample *samples;
};
-fz_error fz_newpixmapwithrect(fz_pixmap **mapp, fz_irect bbox, int n);
-fz_error fz_newpixmap(fz_pixmap **mapp, int x, int y, int w, int h, int n);
-fz_error fz_newpixmapcopy(fz_pixmap **pixp, fz_pixmap *old);
+fz_pixmap * fz_newpixmapwithrect(fz_irect bbox, int n);
+fz_pixmap * fz_newpixmap(int x, int y, int w, int h, int n);
+fz_pixmap * fz_newpixmapcopy(fz_pixmap *old);
void fz_debugpixmap(fz_pixmap *map, char *prefix);
void fz_clearpixmap(fz_pixmap *map);
-void fz_droppixmap(fz_pixmap *map);
+void fz_freepixmap(fz_pixmap *map);
-fz_error fz_scalepixmap(fz_pixmap **dstp, fz_pixmap *src, int xdenom, int ydenom);
+fz_pixmap * fz_scalepixmap(fz_pixmap *src, int xdenom, int ydenom);
/* needed for tiled rendering */
fz_error fz_newscaledpixmap(fz_pixmap **dstp, int w, int h, int n, int xdenom, int ydenom);
fz_error fz_scalepixmaptile(fz_pixmap *dstp, int xoffs, int yoffs,
fz_pixmap *tile, int xdenom, int ydenom);
-#endif
-
-
diff --git a/fitz/fitz_res.h b/fitz/fitz_res.h
index 5d789cd8..64e796b7 100644
--- a/fitz/fitz_res.h
+++ b/fitz/fitz_res.h
@@ -24,8 +24,8 @@ struct fz_device_s
void (*cliptext)(void *, fz_text *);
void (*ignoretext)(void *, fz_text *);
- void (*drawimage)(void *, fz_image *img, fz_matrix *ctm);
- void (*drawshade)(void *, fz_shade *shd, fz_matrix *ctm);
+ void (*drawimage)(void *, fz_image *img, fz_matrix ctm);
+ void (*drawshade)(void *, fz_shade *shd, fz_matrix ctm);
void (*popclip)(void *);
};
@@ -284,5 +284,5 @@ fz_shade *fz_keepshade(fz_shade *shade);
void fz_dropshade(fz_shade *shade);
fz_rect fz_boundshade(fz_shade *shade, fz_matrix ctm);
-fz_error fz_rendershade(fz_shade *shade, fz_matrix ctm, fz_colorspace *dsts, fz_pixmap *dstp);
+void fz_rendershade(fz_shade *shade, fz_matrix ctm, fz_colorspace *dsts, fz_pixmap *dstp);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 23:04:20 +0000