diff --git a/ChangeLog b/ChangeLog index 7aa9a290eb..86c25e8d2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 18 16:57:44 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): + Fix pointer arithmetic on 'void *'. (#108322) + Fri Apr 18 16:31:49 2003 Owen Taylor * configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7aa9a290eb..86c25e8d2c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Apr 18 16:57:44 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): + Fix pointer arithmetic on 'void *'. (#108322) + Fri Apr 18 16:31:49 2003 Owen Taylor * configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7aa9a290eb..86c25e8d2c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Apr 18 16:57:44 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): + Fix pointer arithmetic on 'void *'. (#108322) + Fri Apr 18 16:31:49 2003 Owen Taylor * configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7aa9a290eb..86c25e8d2c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Apr 18 16:57:44 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): + Fix pointer arithmetic on 'void *'. (#108322) + Fri Apr 18 16:31:49 2003 Owen Taylor * configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7aa9a290eb..86c25e8d2c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Apr 18 16:57:44 2003 Owen Taylor + + * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): + Fix pointer arithmetic on 'void *'. (#108322) + Fri Apr 18 16:31:49 2003 Owen Taylor * configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am: diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index 6367d755bc..8eaf6b352f 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -1332,7 +1332,7 @@ draw_with_images (GdkDrawable *drawable, image = _gdk_image_get_scratch (screen, width1, height1, 32, &xs0, &ys0); convert_to_format (src_rgb + y0 * src_rowstride + 4 * x0, src_rowstride, - image->mem + ys0 * image->bpl + xs0 * image->bpp, image->bpl, + (guchar *)image->mem + ys0 * image->bpl + xs0 * image->bpp, image->bpl, format_type, image->byte_order, width1, height1); @@ -1446,7 +1446,7 @@ draw_with_pixmaps (GdkDrawable *drawable, return FALSE; convert_to_format (src_rgb + y0 * src_rowstride + 4 * x0, src_rowstride, - image->mem + ys0 * image->bpl + xs0 * image->bpp, image->bpl, + (guchar *)image->mem + ys0 * image->bpl + xs0 * image->bpp, image->bpl, format_type, image->byte_order, width1, height1);