From f2357f5596083f8fa1fa475bee5191e2810c39ff Mon Sep 17 00:00:00 2001 From: Eric Smith Date: Tue, 1 Jan 2002 10:18:33 +0000 Subject: [PATCH] change coordinates to signed. --- bitblt.c | 7 ++++--- bitblt.h | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bitblt.c b/bitblt.c index f35f957..2701e32 100644 --- a/bitblt.c +++ b/bitblt.c @@ -50,7 +50,8 @@ void free_bitmap (Bitmap *bitmap) boolean get_pixel (Bitmap *bitmap, Point coord) { u8 *p; - if ((coord.x >= bitmap->width) || (coord.y >= bitmap->height)) + if ((coord.x < 0) || (coord.y < 0) || + (coord.x >= bitmap->width) || (coord.y >= bitmap->height)) return (0); p = bitmap->bits + coord.y * bitmap->rowbytes + coord.x / 8; return ((*p & pixel_mask (coord.x & 7)) != 0); @@ -59,7 +60,8 @@ boolean get_pixel (Bitmap *bitmap, Point coord) void set_pixel (Bitmap *bitmap, Point coord, boolean value) { u8 *p; - if ((coord.x >= bitmap->width) || (coord.y >= bitmap->height)) + if ((coord.x < 0) || (coord.y < 0) || + (coord.x >= bitmap->width) || (coord.y >= bitmap->height)) return; p = bitmap->bits + coord.y * bitmap->rowbytes + coord.x / 8; if (value) @@ -77,7 +79,6 @@ Bitmap *bitblt (Bitmap *src_bitmap, int tfn) { Point src_point, dest_point; - boolean src_pixel, dest_pixel; if (! dest_bitmap) { diff --git a/bitblt.h b/bitblt.h index d78c8b5..a8f4c06 100644 --- a/bitblt.h +++ b/bitblt.h @@ -1,7 +1,7 @@ typedef struct Point { - u32 x; - u32 y; + int x; + int y; } Point; typedef struct Rect