Some minor bug fixes (prevent crashes in dana and upon quit)

[metawatch.git] / mw_utility.c

diff --git a/mw_utility.c b/mw_utility.c
index 53c5f7ab3000e401e5d4f511d25eefe6453763f4..fa7d3420b5f089c6f9973b570266dead9e0324c6 100644 (file)
--- a/mw_utility.c
+++ b/mw_utility.c
@@ -155,6 +155,9 @@ void mw_buf_draw_pixel(mw_buffer *mwbuf, unsigned int x, unsigned int y, mw_colo
        if (clr == MW_TRANSPARENT)
                return;
 
+       if (x < 0 || x > 128 || y < 0 || y > 128)
+               return;
+
        *(unsigned char *)(mwbuf->pbuf+((y*mwbuf->res_x)+x)) = clr;
 }
 
@@ -256,6 +259,61 @@ void mw_buf_draw_line_bresenham(mw_buffer *mwbuf, unsigned int xstart, unsigned
        }
 }
 
+void mw_buf_draw_line_bresenham_w(mw_buffer *mwbuf, unsigned int xstart, unsigned int ystart, unsigned int xend, unsigned int yend, unsigned char thickness, mw_color clr)
+{
+       int i, x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;
+ 
+       dx = xend - xstart;
+       dy = yend - ystart;
+ 
+       incx = (dx >= 0) ? 1 : -1;
+       incy = (dy >= 0) ? 1 : -1;
+
+       if (dx<0)
+               dx = -dx;
+       if (dy<0)
+               dy = -dy;
+ 
+       if (dx>dy) {
+               pdx = incx; pdy = 0;
+               ddx=incx; ddy=incy;
+               es =dy;   el =dx;
+       } else {
+               pdx=0;    pdy=incy;
+               ddx=incx; ddy=incy;
+               es =dx;   el =dy;
+       }
+ 
+       x = xstart;
+       y = ystart;
+       err = el/2;
+       mw_buf_draw_pixel(mwbuf, x, y, clr);
+       for (i=1; i<thickness; i++) {
+               mw_buf_draw_pixel(mwbuf, x-i, y, clr);
+               mw_buf_draw_pixel(mwbuf, x+i, y, clr);
+               mw_buf_draw_pixel(mwbuf, x, y-i, clr);
+               mw_buf_draw_pixel(mwbuf, x, y+i, clr);
+       }
+ 
+       for (t = 0; t < el; ++t) {
+               err -= es; 
+               if (err < 0) {
+                       err += el;
+                       x += ddx;
+                       y += ddy;
+               } else {
+                       x += pdx;
+                       y += pdy;
+               }
+               mw_buf_draw_pixel(mwbuf, x, y, clr);
+               for (i=1; i<thickness; i++) {
+                       mw_buf_draw_pixel(mwbuf, x-i, y, clr);
+                       mw_buf_draw_pixel(mwbuf, x+i, y, clr);
+                       mw_buf_draw_pixel(mwbuf, x, y-i, clr);
+                       mw_buf_draw_pixel(mwbuf, x, y+i, clr);
+               }
+       }
+}
 
 /* ----------------------------------------------------------------------
  * Complex combined functions, for user convenience