From 3b425b8bf0c58e25da576ed86496171ea19240f9 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Tue, 16 Nov 2004 08:58:17 +0100 Subject: removed c99-isms. improved bbox handling. --- tree/node2.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'tree/node2.c') diff --git a/tree/node2.c b/tree/node2.c index 0af3ab7d..542b1590 100644 --- a/tree/node2.c +++ b/tree/node2.c @@ -287,25 +287,17 @@ fz_newimagenode(fz_node **nodep, fz_image *image) void fz_dropimagenode(fz_imagenode *node) { - // XXX fz_dropimage(node->image); + fz_dropimage(node->image); } fz_rect fz_boundimagenode(fz_imagenode *node, fz_matrix ctm) { - fz_point ll, lr, ul, ur; - fz_rect r; - - ll = fz_transformpoint(ctm, (fz_point){0,0}); - lr = fz_transformpoint(ctm, (fz_point){1,0}); - ul = fz_transformpoint(ctm, (fz_point){0,1}); - ur = fz_transformpoint(ctm, (fz_point){1,1}); - - r.min.x = MIN4(ll.x, lr.x, ul.x, ur.x); - r.min.y = MIN4(ll.y, lr.y, ul.y, ur.y); - r.max.x = MAX4(ll.x, lr.x, ul.x, ur.x); - r.max.y = MAX4(ll.y, lr.y, ul.y, ur.y); - - return r; + fz_rect bbox; + bbox.min.x = 0; + bbox.min.y = 0; + bbox.max.x = 1; + bbox.max.y = 1; + return fz_transformaabb(ctm, bbox); } -- cgit v1.2.3