Fix pointer arithmetic on 'void *'. (#108322)

Fri Apr 18 16:57:44 2003  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps):
        Fix pointer arithmetic on 'void *'. (#108322)
This commit is contained in:
Owen Taylor 2003-04-18 20:59:49 +00:00 committed by Owen Taylor
parent ac2ef34988
commit 89b2a072ff
6 changed files with 27 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Fri Apr 18 16:57:44 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps):
Fix pointer arithmetic on 'void *'. (#108322)
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:

View File

@ -1,3 +1,8 @@
Fri Apr 18 16:57:44 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps):
Fix pointer arithmetic on 'void *'. (#108322)
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:

View File

@ -1,3 +1,8 @@
Fri Apr 18 16:57:44 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps):
Fix pointer arithmetic on 'void *'. (#108322)
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:

View File

@ -1,3 +1,8 @@
Fri Apr 18 16:57:44 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps):
Fix pointer arithmetic on 'void *'. (#108322)
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:

View File

@ -1,3 +1,8 @@
Fri Apr 18 16:57:44 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps):
Fix pointer arithmetic on 'void *'. (#108322)
Fri Apr 18 16:31:49 2003 Owen Taylor <otaylor@redhat.com>
* configure.in gdk/x11/gdkdisplay-x11.c modules/input/Makefile.am:

View File

@ -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);