zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite trim_rect() for robustness.

Browse Source 
The previous version dealt adequately with rectangles _partially_
overlapping the edge of the canvas, but doesn't correctly handle a
rectangle that's completely out of bounds in one direction. Replace
with a complete rewrite which is more easily seen to be correct. Also,
while I'm at it, add a missing condition to draw_update() so that we
don't even bother calling the Javascript half of it on any rectangle
that's been trimmed into nonexistence.

[originally from svn r9800]
This commit is contained in:
Simon Tatham
2013-04-01 16:23:03 +00:00
parent bce3f1bd26
commit 01471b5dc9
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
emcc.c
View File

@ -416,27 +416,30 @@ static void js_blitter_free(void *handle, blitter *bl)
static void trim_rect(int *x, int *y, int *w, int *h) static void trim_rect(int *x, int *y, int *w, int *h)
{ {
int x0, x1, y0, y1;
/* /*
* Reduce the size of the copied rectangle to stop it going * Reduce the size of the copied rectangle to stop it going
* outside the bounds of the canvas. * outside the bounds of the canvas.
*/ */
if (*x < 0) {
*w += *x;
*x = 0;
}
if (*y < 0) {
*h += *y;
*y = 0;
}
if (*w > canvas_w - *x)
*w = canvas_w - *x;
if (*h > canvas_h - *y)
*h = canvas_h - *y;
if (*w < 0) /* Transform from x,y,w,h form into coordinates of all edges */
*w = 0; x0 = *x;
if (*h < 0) y0 = *y;
*h = 0; x1 = *x + *w;
y1 = *y + *h;
/* Clip each coordinate at both extremes of the canvas */
x0 = (x0 < 0 ? 0 : x0 > canvas_w ? canvas_w : x0);
x1 = (x1 < 0 ? 0 : x1 > canvas_w ? canvas_w : x1);
y0 = (y0 < 0 ? 0 : y0 > canvas_h ? canvas_h : y0);
y1 = (y1 < 0 ? 0 : y1 > canvas_h ? canvas_h : y1);
/* Transform back into x,y,w,h to return */
*x = x0;
*y = y0;
*w = x1 - x0;
*h = y1 - y0;
} }
static void js_blitter_save(void *handle, blitter *bl, int x, int y) static void js_blitter_save(void *handle, blitter *bl, int x, int y)
@ -458,6 +461,7 @@ static void js_blitter_load(void *handle, blitter *bl, int x, int y)
static void js_draw_update(void *handle, int x, int y, int w, int h) static void js_draw_update(void *handle, int x, int y, int w, int h)
{ {
trim_rect(&x, &y, &w, &h); trim_rect(&x, &y, &w, &h);
if (w > 0 && h > 0)
js_canvas_draw_update(x, y, w, h); js_canvas_draw_update(x, y, w, h);
} }