diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2013-01-25 14:07:29 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2013-01-30 14:07:21 +0100 |
| commit | ddb92b7c3fdfcf9bf3d7463dde4e662ca10f79ba (patch) | |
| tree | f9d960048a60066ab8829af0fe6a22104ef30ee3 /draw/draw_edge.c | |
| parent | d8ad064b0c4bcd539c06c98af070613ff818ee0b (diff) | |
| download | mupdf-ddb92b7c3fdfcf9bf3d7463dde4e662ca10f79ba.tar.xz | |
Eliminate fz_bbox in favor of fz_rect everywhere.
Diffstat (limited to 'draw/draw_edge.c')
| -rw-r--r-- | draw/draw_edge.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/draw/draw_edge.c b/draw/draw_edge.c index 9fc21d97..df59ba14 100644 --- a/draw/draw_edge.c +++ b/draw/draw_edge.c @@ -158,8 +158,8 @@ struct fz_edge_s struct fz_gel_s { - fz_bbox clip; - fz_bbox bbox; + fz_rect clip; + fz_rect bbox; int cap, len; fz_edge *edges; int acap, alen; @@ -203,7 +203,7 @@ fz_new_gel(fz_context *ctx) } void -fz_reset_gel(fz_gel *gel, fz_bbox clip) +fz_reset_gel(fz_gel *gel, fz_rect clip) { fz_aa_context *ctxaa = gel->ctx->aa; @@ -235,13 +235,13 @@ fz_free_gel(fz_gel *gel) fz_free(gel->ctx, gel); } -fz_bbox +fz_rect fz_bound_gel(fz_gel *gel) { - fz_bbox bbox; + fz_rect bbox; fz_aa_context *ctxaa = gel->ctx->aa; if (gel->len == 0) - return fz_empty_bbox; + return fz_empty_rect; bbox.x0 = fz_idiv(gel->bbox.x0, fz_aa_hscale); bbox.y0 = fz_idiv(gel->bbox.y0, fz_aa_vscale); bbox.x1 = fz_idiv(gel->bbox.x1, fz_aa_hscale) + 1; @@ -666,7 +666,7 @@ static inline void blit_aa(fz_pixmap *dst, int x, int y, } static void -fz_scan_convert_aa(fz_gel *gel, int eofill, fz_bbox clip, +fz_scan_convert_aa(fz_gel *gel, int eofill, fz_rect clip, fz_pixmap *dst, unsigned char *color) { unsigned char *alphas; @@ -851,7 +851,7 @@ clip_ended: */ static inline void blit_sharp(int x0, int x1, int y, - fz_bbox clip, fz_pixmap *dst, unsigned char *color) + fz_rect clip, fz_pixmap *dst, unsigned char *color) { unsigned char *dp; x0 = fz_clampi(x0, dst->x, dst->x + dst->w); @@ -867,7 +867,7 @@ static inline void blit_sharp(int x0, int x1, int y, } static inline void non_zero_winding_sharp(fz_gel *gel, int y, - fz_bbox clip, fz_pixmap *dst, unsigned char *color) + fz_rect clip, fz_pixmap *dst, unsigned char *color) { int winding = 0; int x = 0; @@ -883,7 +883,7 @@ static inline void non_zero_winding_sharp(fz_gel *gel, int y, } static inline void even_odd_sharp(fz_gel *gel, int y, - fz_bbox clip, fz_pixmap *dst, unsigned char *color) + fz_rect clip, fz_pixmap *dst, unsigned char *color) { int even = 0; int x = 0; @@ -899,7 +899,7 @@ static inline void even_odd_sharp(fz_gel *gel, int y, } static void -fz_scan_convert_sharp(fz_gel *gel, int eofill, fz_bbox clip, +fz_scan_convert_sharp(fz_gel *gel, int eofill, fz_rect clip, fz_pixmap *dst, unsigned char *color) { int e = 0; @@ -955,7 +955,7 @@ fz_scan_convert_sharp(fz_gel *gel, int eofill, fz_bbox clip, } void -fz_scan_convert(fz_gel *gel, int eofill, fz_bbox clip, +fz_scan_convert(fz_gel *gel, int eofill, fz_rect clip, fz_pixmap *dst, unsigned char *color) { fz_aa_context *ctxaa = gel->ctx->aa; |