+Mon Oct 7 16:07:52 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * gdk/x11/gdkimage-x11.c gdk/linux-fb/gdkimage-x11.c
+ gdk/win32/gdkimage-x11.c: (gdk_image_get_pixel):
+ (gdk_image_put_pixel): Fixed sense of bounds checks.
+
Sun Oct 6 21:23:29 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcontainer.[ch] gtk/gtkbox.[ch] gtk/gtkhbox.[ch]
+Mon Oct 7 16:07:52 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * gdk/x11/gdkimage-x11.c gdk/linux-fb/gdkimage-x11.c
+ gdk/win32/gdkimage-x11.c: (gdk_image_get_pixel):
+ (gdk_image_put_pixel): Fixed sense of bounds checks.
+
Sun Oct 6 21:23:29 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcontainer.[ch] gtk/gtkbox.[ch] gtk/gtkhbox.[ch]
+Mon Oct 7 16:07:52 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * gdk/x11/gdkimage-x11.c gdk/linux-fb/gdkimage-x11.c
+ gdk/win32/gdkimage-x11.c: (gdk_image_get_pixel):
+ (gdk_image_put_pixel): Fixed sense of bounds checks.
+
Sun Oct 6 21:23:29 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcontainer.[ch] gtk/gtkbox.[ch] gtk/gtkhbox.[ch]
+Mon Oct 7 16:07:52 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * gdk/x11/gdkimage-x11.c gdk/linux-fb/gdkimage-x11.c
+ gdk/win32/gdkimage-x11.c: (gdk_image_get_pixel):
+ (gdk_image_put_pixel): Fixed sense of bounds checks.
+
Sun Oct 6 21:23:29 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcontainer.[ch] gtk/gtkbox.[ch] gtk/gtkhbox.[ch]
+Mon Oct 7 16:07:52 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * gdk/x11/gdkimage-x11.c gdk/linux-fb/gdkimage-x11.c
+ gdk/win32/gdkimage-x11.c: (gdk_image_get_pixel):
+ (gdk_image_put_pixel): Fixed sense of bounds checks.
+
Sun Oct 6 21:23:29 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcontainer.[ch] gtk/gtkbox.[ch] gtk/gtkhbox.[ch]
+Mon Oct 7 16:07:52 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * gdk/x11/gdkimage-x11.c gdk/linux-fb/gdkimage-x11.c
+ gdk/win32/gdkimage-x11.c: (gdk_image_get_pixel):
+ (gdk_image_put_pixel): Fixed sense of bounds checks.
+
Sun Oct 6 21:23:29 2002 Manish Singh <yosh@gimp.org>
* gtk/gtkcontainer.[ch] gtk/gtkbox.[ch] gtk/gtkhbox.[ch]
GdkImagePrivateFB *private;
g_return_val_if_fail (image != NULL, 0);
- g_return_val_if_fail (x < 0 || x >= image->width, 0);
- g_return_val_if_fail (y < 0 || y >= image->height, 0);
+ g_return_val_if_fail (x >= 0 && x < image->width, 0);
+ g_return_val_if_fail (y >= 0 && y < image->height, 0);
private = GDK_IMAGE_PRIVATE_DATA (image);
guchar *ptr = image->mem;
g_return_if_fail (image != NULL);
- g_return_if_fail (x < 0 || x >= image->width);
- g_return_if_fail (y < 0 || y >= image->height);
+ g_return_if_fail (x >= 0 && x < image->width);
+ g_return_if_fail (y >= 0 && y < image->height);
switch (image->depth)
{
guchar *pixelp;
g_return_val_if_fail (image != NULL, 0);
- g_return_val_if_fail (x < 0 || x >= image->width, 0);
- g_return_val_if_fail (y < 0 || y >= image->height, 0);
+ g_return_val_if_fail (x >= 0 && x < image->width, 0);
+ g_return_val_if_fail (y >= 0 && y < image->height, 0);
if (!(x >= 0 && x < image->width && y >= 0 && y < image->height))
return 0;
guchar *pixelp;
g_return_if_fail (image != NULL);
- g_return_if_fail (x < 0 || x >= image->width);
- g_return_if_fail (y < 0 || y >= image->height);
+ g_return_if_fail (x >= 0 && x < image->width);
+ g_return_if_fail (y >= 0 && y < image->height);
if (!(x >= 0 && x < image->width && y >= 0 && y < image->height))
return;
GDK_PIXMAP_XID (pix),
mask_format, 0, NULL);
- dest_pict = gdk_x11_drawable_get_picture (drawable);
+ dest_pict = gdk_x11_drawable_get_picture (drawable);
pix_gc = gdk_gc_new (pix);
GdkImagePrivateX11 *private;
g_return_val_if_fail (GDK_IS_IMAGE (image), 0);
- g_return_val_if_fail (x < 0 || x >= image->width, 0);
- g_return_val_if_fail (y < 0 || y >= image->height, 0);
+ g_return_val_if_fail (x >= 0 && x < image->width, 0);
+ g_return_val_if_fail (y >= 0 && y < image->height, 0);
private = PRIVATE_DATA (image);
GdkImagePrivateX11 *private;
g_return_if_fail (GDK_IS_IMAGE (image));
- g_return_if_fail (x < 0 || x >= image->width);
- g_return_if_fail (y < 0 || y >= image->height);
+ g_return_if_fail (x >= 0 && x < image->width);
+ g_return_if_fail (y >= 0 && y < image->height);
private = PRIVATE_DATA (image);