summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
Diffstat (limited to 'render')
-rw-r--r--render/pixmap.c101
-rw-r--r--render/render.c30
-rw-r--r--render/renderimage.c20
3 files changed, 91 insertions, 60 deletions
diff --git a/render/pixmap.c b/render/pixmap.c
index a9287ea8..9bbe297b 100644
--- a/render/pixmap.c
+++ b/render/pixmap.c
@@ -37,61 +37,35 @@ fz_clearpixmap(fz_pixmap *pix)
memset(pix->samples, 0, pix->w * pix->h * pix->n * sizeof(fz_sample));
}
-fz_error *
-fz_convertpixmap(fz_pixmap **dstp, fz_pixmap *src, fz_colorspace *srcs, fz_colorspace *dsts)
-{
- fz_error *error;
- fz_pixmap *dst;
- float srcv[32];
- float dstv[32];
- int y, x, k;
-
- error = fz_newpixmap(&dst, src->x, src->y, src->w, src->h, dsts->n + 1);
- if (error)
- return error;
-
- unsigned char *s = src->samples;
- unsigned char *d = dst->samples;
-
- printf("convert pixmap from %s to %s\n", srcs->name, dsts->name);
-
- for (y = 0; y < src->h; y++)
- {
- for (x = 0; x < src->w; x++)
- {
- *d++ = *s++;
-
- for (k = 0; k < src->n - 1; k++)
- srcv[k] = *s++ / 255.0;
-
- fz_convertcolor(srcs, srcv, dsts, dstv);
-
- for (k = 0; k < dst->n - 1; k++)
- *d++ = dstv[k] * 255;
- }
- }
-
- *dstp = dst;
- return nil;
-}
-
void
fz_blendover(fz_pixmap *src, fz_pixmap *dst)
{
int x, y, k;
+ fz_irect sr, dr, rect;
+ unsigned char *s;
+ unsigned char *d;
assert(dst->n == src->n || src->n == 1);
- assert(dst->w == src->w);
- assert(dst->h == src->h);
- unsigned char *s = src->samples;
- unsigned char *d = dst->samples;
+ sr.min.x = src->x;
+ sr.min.y = src->y;
+ sr.max.x = src->x + src->w;
+ sr.max.y = src->y + src->h;
+
+ dr.min.x = dst->x;
+ dr.min.y = dst->y;
+ dr.max.x = dst->x + dst->w;
+ dr.max.y = dst->y + dst->h;
+
+ rect = fz_intersectirects(sr, dr);
if (dst->n == src->n)
{
- for (y = 0; y < dst->h; y++)
+ for (y = rect.min.y; y < rect.max.y; y++)
{
- for (x = 0; x < dst->w; x++)
+ s = src->samples + ((rect.min.x - src->x) + (y - src->y) * src->w) * src->n;
+ d = dst->samples + ((rect.min.x - dst->x) + (y - dst->y) * dst->w) * dst->n;
+ for (x = rect.min.x; x < rect.max.x; x++)
{
int sa = s[0];
int ssa = 255 - sa;
@@ -106,9 +80,11 @@ fz_blendover(fz_pixmap *src, fz_pixmap *dst)
}
else if (src->n == 1)
{
- for (y = 0; y < dst->h; y++)
+ for (y = rect.min.y; y < rect.max.y; y++)
{
- for (x = 0; x < dst->w; x++)
+ s = src->samples + ((rect.min.x - src->x) + (y - src->y) * src->w) * src->n;
+ d = dst->samples + ((rect.min.x - dst->x) + (y - dst->y) * dst->w) * dst->n;
+ for (x = rect.min.x; x < rect.max.x; x++)
{
int sa = s[0];
int ssa = 255 - sa;
@@ -127,22 +103,41 @@ fz_blendover(fz_pixmap *src, fz_pixmap *dst)
void
fz_blendmask(fz_pixmap *dst, fz_pixmap *src, fz_pixmap *msk)
{
+ unsigned char *d;
+ unsigned char *s;
+ unsigned char *m;
+ fz_irect sr, dr, mr, rect;
int x, y, k;
assert(src->n == dst->n);
- unsigned char *d = dst->samples;
- unsigned char *s = src->samples;
- unsigned char *m = msk->samples;
+ sr.min.x = src->x;
+ sr.min.y = src->y;
+ sr.max.x = src->x + src->w;
+ sr.max.y = src->y + src->h;
+
+ dr.min.x = dst->x;
+ dr.min.y = dst->y;
+ dr.max.x = dst->x + dst->w;
+ dr.max.y = dst->y + dst->h;
+
+ mr.min.x = msk->x;
+ mr.min.y = msk->y;
+ mr.max.x = msk->x + msk->w;
+ mr.max.y = msk->y + msk->h;
- for (y = 0; y < dst->h; y++)
+ rect = fz_intersectirects(sr, dr);
+ rect = fz_intersectirects(rect, mr);
+
+ for (y = rect.min.y; y < rect.max.y; y++)
{
- for (x = 0; x < dst->w; x++)
+ s = src->samples + ((rect.min.x - src->x) + (y - src->y) * src->w) * src->n;
+ d = dst->samples + ((rect.min.x - dst->x) + (y - dst->y) * dst->w) * dst->n;
+ m = msk->samples + ((rect.min.x - msk->x) + (y - msk->y) * msk->w) * msk->n;
+ for (x = rect.min.x; x < rect.max.x; x++)
{
for (k = 0; k < dst->n; k++)
- {
*d++ = fz_mul255(*s++, *m);
- }
m += msk->n;
}
}
diff --git a/render/render.c b/render/render.c
index ad42bdbe..1798e011 100644
--- a/render/render.c
+++ b/render/render.c
@@ -9,7 +9,7 @@ fz_error *fz_renderimageover(fz_renderer*, fz_imagenode*, fz_matrix);
fz_error *fz_renderimage(fz_renderer*, fz_imagenode*, fz_matrix);
fz_error *
-fz_newrenderer(fz_renderer **gcp, fz_colorspace *processcolormodel)
+fz_newrenderer(fz_renderer **gcp, fz_colorspace *processcolormodel, int gcmem)
{
fz_error *error;
fz_renderer *gc;
@@ -26,7 +26,7 @@ fz_newrenderer(fz_renderer **gcp, fz_colorspace *processcolormodel)
gc->tmp = nil;
gc->acc = nil;
- error = fz_newglyphcache(&gc->cache, 4096, 256 * 1024);
+ error = fz_newglyphcache(&gc->cache, gcmem / 32, gcmem);
if (error)
goto cleanup;
@@ -191,6 +191,8 @@ fz_rendermask(fz_renderer *gc, fz_masknode *mask, fz_matrix ctm)
fz_node *color;
fz_node *shape;
int oldmode;
+ fz_rect bbox;
+ int ox, oy, ow, oh;
color = mask->super.child;
shape = color->next;
@@ -201,6 +203,8 @@ fz_rendermask(fz_renderer *gc, fz_masknode *mask, fz_matrix ctm)
return fz_rendercolorpath(gc, (fz_pathnode*)shape, (fz_colornode*)color, ctm);
if (fz_istextnode(shape) && fz_iscolornode(color))
return fz_rendercolortext(gc, (fz_textnode*)shape, (fz_colornode*)color, ctm);
+ if (fz_isimagenode(shape) && fz_iscolornode(color))
+ puts("could optimize image mask!");
}
printf("begin mask\n");
@@ -210,6 +214,23 @@ printf("begin mask\n");
gc->acc = nil;
gc->mode = FZ_RMASK;
+ // TODO: set clip bbox to that of shape
+
+ bbox = fz_boundnode(shape, ctm);
+ bbox = fz_intersectrects(bbox, (fz_rect){{gc->x,gc->y},{gc->x+gc->w,gc->y+gc->h}});
+ printf("mask bbox [%g %g %g %g]\n", bbox.min.x, bbox.min.y, bbox.max.x, bbox.max.y);
+ ox = gc->x;
+ oy = gc->y;
+ ow = gc->w;
+ oh = gc->h;
+
+ gc->x = fz_floor(bbox.min.x) - 1;
+ gc->y = fz_floor(bbox.min.y) - 1;
+ gc->w = fz_ceil(bbox.max.x) - fz_floor(bbox.min.x) + 1;
+ gc->h = fz_ceil(bbox.max.y) - fz_floor(bbox.min.y) + 1;
+ ctm.e -= bbox.min.x - fz_floor(bbox.min.x);
+ ctm.f -= bbox.min.y - fz_floor(bbox.min.y);
+
gc->tmp = nil;
error = fz_rendernode(gc, color, ctm);
if (error)
@@ -240,6 +261,11 @@ if (!shapepix) return nil;
gc->acc = oldacc;
gc->mode = oldmode;
+ gc->x = ox;
+ gc->y = oy;
+ gc->w = ow;
+ gc->h = oh;
+
printf("end mask\n");
return nil;
diff --git a/render/renderimage.c b/render/renderimage.c
index e4daae57..3741ab73 100644
--- a/render/renderimage.c
+++ b/render/renderimage.c
@@ -12,8 +12,6 @@ static inline int getcomp(fz_pixmap *pix, int u, int v, int k)
return 0;
if (v < 0 || v >= pix->h)
return 0;
-// u = CLAMP(u, 0, pix->w - 1);
-// v = CLAMP(v, 0, pix->h - 1);
return pix->samples[ (v * pix->w + u) * pix->n + k ];
}
@@ -204,7 +202,8 @@ printf(" draw image rgb over\n");
else
{
printf(" draw image rgb over after cs transform\n");
- error = fz_convertpixmap(&tile3, tile2, cs, gc->model);
+ error = fz_newpixmap(&tile3, tile2->x, tile2->y, tile2->w, tile2->h, gc->model->n + 1);
+ fz_convertpixmap(cs, tile2, gc->model, tile3);
error = drawtile(gc, gc->acc, tile3, ctm, 1);
fz_droppixmap(tile3);
}
@@ -214,8 +213,19 @@ printf(" draw image rgb over after cs transform\n");
else
{
printf(" draw image after cs transform\n");
- error = fz_convertpixmap(&tile3, tile2, cs, gc->model);
- error = fz_newpixmap(&gc->tmp, gc->x, gc->y, gc->w, gc->h, gc->model->n + 1);
+ error = fz_newpixmap(&tile3, tile2->x, tile2->y, tile2->w, tile2->h, gc->model->n + 1);
+ fz_convertpixmap(cs, tile2, gc->model, tile3);
+ fz_rect bbox = fz_boundnode((fz_node*)node, ctm);
+ fz_irect aabb;
+ aabb.min.x = fz_floor(bbox.min.x) - 1;
+ aabb.min.y = fz_floor(bbox.min.y) - 1;
+ aabb.max.x = fz_ceil(bbox.max.x) + 1;
+ aabb.max.y = fz_ceil(bbox.max.y) + 1;
+ aabb = fz_intersectirects(aabb, (fz_irect){{gc->x,gc->y},{gc->x+gc->w,gc->y+gc->h}});
+ error = fz_newpixmap(&gc->tmp,
+ aabb.min.x, aabb.min.y,
+ aabb.max.x - aabb.min.x, aabb.max.y - aabb.min.y,
+ gc->model->n + 1);
fz_clearpixmap(gc->tmp);
error = drawtile(gc, gc->tmp, tile3, ctm, 0);
fz_droppixmap(tile3);
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-24 19:36:50 +0000