rename pixel32/16 to RrPixel32/16

[chaz/openbox] / render / color.c

diff --git a/render/color.c b/render/color.c
index 345736a310f42c09004f09d2e42d6389a4bb8b7a..73e25769c09c011485ea405b931007a2faffdd80 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -66,12 +66,12 @@ void RrColorFree(RrColor *c)
     }
 }
 
-void reduce_depth(const RrInstance *inst, pixel32 *data, XImage *im)
+void reduce_depth(const RrInstance *inst, RrPixel32 *data, XImage *im)
 {
     int r, g, b;
     int x,y;
-    pixel32 *p32 = (pixel32 *) im->data;
-    pixel16 *p16 = (pixel16 *) im->data;
+    RrPixel32 *p32 = (RrPixel32 *) im->data;
+    RrPixel16 *p16 = (RrPixel16 *) im->data;
     unsigned char *p8 = (unsigned char *)im->data;
     switch (im->bits_per_pixel) {
     case 32:
@@ -174,12 +174,12 @@ static void swap_byte_order(XImage *im)
         im->byte_order = LSBFirst;
 }
 
-void increase_depth(const RrInstance *inst, pixel32 *data, XImage *im)
+void increase_depth(const RrInstance *inst, RrPixel32 *data, XImage *im)
 {
     int r, g, b;
     int x,y;
-    pixel32 *p32 = (pixel32 *) im->data;
-    pixel16 *p16 = (pixel16 *) im->data;
+    RrPixel32 *p32 = (RrPixel32 *) im->data;
+    RrPixel16 *p16 = (RrPixel16 *) im->data;
     unsigned char *p8 = (unsigned char *)im->data;
 
     if (im->byte_order != render_endian)