AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Cast pointers to guintptr, not unsigned long, before doing bit tests on

Browse Source 
2008-08-05  Tor Lillqvist  <tml@novell.com>

	* gdk/gdkrgb.c: Cast pointers to guintptr, not unsigned long,
	before doing bit tests on them.


svn path=/trunk/; revision=20987
This commit is contained in:
Tor Lillqvist 2008-08-04 22:26:26 +00:00 committed by Tor Lillqvist
parent 6a5f3cc9d9
commit ad2ea92f75
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-08-05 Tor Lillqvist <tml@novell.com>
* gdk/gdkrgb.c: Cast pointers to guintptr, not unsigned long,
before doing bit tests on them.
2008-08-05 Tor Lillqvist <tml@novell.com> 2008-08-05 Tor Lillqvist <tml@novell.com>
* configure.in: Define GDK_NATIVE_WINDOW_POINTER on 32-bit * configure.in: Define GDK_NATIVE_WINDOW_POINTER on 32-bit

10
gdk/gdkrgb.c
View File

@ -862,7 +862,7 @@ gdk_rgb_convert_8 (GdkRgbInfo *image_info, GdkImage *image,
{ {
bp2 = bptr; bp2 = bptr;
obptr = obuf; obptr = obuf;
if (((unsigned long)obuf | (unsigned long) bp2) & 3) if (((guintptr)obuf | (guintptr) bp2) & 3)
{ {
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
@ -1495,7 +1495,7 @@ gdk_rgb_convert_565 (GdkRgbInfo *image_info, GdkImage *image,
{ {
bp2 = bptr; bp2 = bptr;
obptr = obuf; obptr = obuf;
if (((unsigned long)obuf | (unsigned long) bp2) & 3) if (((guintptr)obuf | (guintptr) bp2) & 3)
{ {
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
@ -1626,7 +1626,7 @@ gdk_rgb_convert_565_gray (GdkRgbInfo *image_info, GdkImage *image,
{ {
bp2 = bptr; bp2 = bptr;
obptr = obuf; obptr = obuf;
if (((unsigned long)obuf | (unsigned long) bp2) & 3) if (((guintptr)obuf | (guintptr) bp2) & 3)
{ {
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
@ -1768,7 +1768,7 @@ gdk_rgb_convert_565_d (GdkRgbInfo *image_info, GdkImage *image,
const guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT); const guint32 *dmp = DM_565 + ((y & (DM_HEIGHT - 1)) << DM_WIDTH_SHIFT);
bp2 = bptr; bp2 = bptr;
obptr = obuf; obptr = obuf;
if (((unsigned long)obuf | (unsigned long) bp2) & 3) if (((guintptr)obuf | (guintptr) bp2) & 3)
{ {
for (x = x_align; x < width; x++) for (x = x_align; x < width; x++)
{ {
@ -2030,7 +2030,7 @@ gdk_rgb_convert_888_lsb (GdkRgbInfo *image_info, GdkImage *image,
{ {
bp2 = bptr; bp2 = bptr;
obptr = obuf; obptr = obuf;
if (((unsigned long)obuf | (unsigned long) bp2) & 3) if (((guintptr)obuf | (guintptr) bp2) & 3)
{ {
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {