Menu
▾
▴
E CVS: libs/imlib2 vapier
|
From: <enl...@li...> - 2005-09-29 07:47:40
|
Enlightenment CVS committal
Author : vapier
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
rgba.c
Log Message:
fix by Tres Melton to address 64bit errors: dont cast pointers as ints, cast them as longs
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/rgba.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- rgba.c 1 Nov 2004 09:45:31 -0000 1.1
+++ rgba.c 29 Sep 2005 07:47:29 -0000 1.2
@@ -2854,7 +2854,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -2924,7 +2924,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -2996,7 +2996,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3066,7 +3066,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3138,7 +3138,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3208,7 +3208,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3280,7 +3280,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3350,7 +3350,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_2(width))
{
@@ -3421,7 +3421,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3465,7 +3465,7 @@
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB332(src, dest);
}
@@ -3518,7 +3518,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3563,7 +3563,7 @@
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB332_DITHER(src, dest);
}
@@ -3597,7 +3597,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3641,7 +3641,7 @@
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB666(src, dest);
}
@@ -3694,7 +3694,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3739,7 +3739,7 @@
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB666_DITHER(src, dest);
}
@@ -3773,7 +3773,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3817,7 +3817,7 @@
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB232(src, dest);
}
@@ -3870,7 +3870,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3915,7 +3915,7 @@
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB232_DITHER(src, dest);
}
@@ -3949,7 +3949,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -3993,7 +3993,7 @@
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB222(src, dest);
}
@@ -4046,7 +4046,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4091,7 +4091,7 @@
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB222_DITHER(src, dest);
}
@@ -4125,7 +4125,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4169,7 +4169,7 @@
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB221(src, dest);
}
@@ -4222,7 +4222,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4267,7 +4267,7 @@
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB221_DITHER(src, dest);
}
@@ -4301,7 +4301,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4345,7 +4345,7 @@
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB121(src, dest);
}
@@ -4398,7 +4398,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4443,7 +4443,7 @@
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB121_DITHER(src, dest);
}
@@ -4477,7 +4477,7 @@
w = width;
h = height;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4521,7 +4521,7 @@
{
for (y = 0; y < h; y++)
{
- for (x = 0; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = 0; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB111(src, dest);
}
@@ -4574,7 +4574,7 @@
w = width + dx;
h = height + dy;
- if (IS_ALIGNED_32((int)dest))
+ if (IS_ALIGNED_32((unsigned long)dest))
{
if (IS_MULTIPLE_4(width))
{
@@ -4619,7 +4619,7 @@
for (y = dy; y < h; y++)
{
w = width + dx;
- for (x = dx; ((x < w) && (!(IS_ALIGNED_32((int)dest)))); x++)
+ for (x = dx; ((x < w) && (!(IS_ALIGNED_32((unsigned long)dest)))); x++)
{
WRITE1_RGBA_RGB111_DITHER(src, dest);
}
|