Fix a couple memory leaks.

[chaz/openbox] / render / color.c

diff --git a/render/color.c b/render/color.c
index 46f81161e1defaf86e43602538e1a0c13757ccaa..3e9199c30495aedc08967fcdf7fb8c42486e9f08 100644 (file)
--- a/render/color.c
+++ b/render/color.c
@@ -77,8 +77,8 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
             (RrGreenOffset(inst) != RrDefaultGreenOffset)) {
             g_message("CONVERSION %d->%d %d->%d %d->%d",
                       RrDefaultRedOffset, RrRedOffset(inst),
-                      RrDefaultBlueOffset, RrGreenOffset(inst),
-                      RrDefaultGreenOffset, RrBlueOffset(inst));
+                      RrDefaultGreenOffset, RrGreenOffset(inst),
+                      RrDefaultBlueOffset, RrBlueOffset(inst));
             for (y = 0; y < im->height; y++) {
                 for (x = 0; x < im->width; x++) {
                     r = (data[x] >> RrDefaultRedOffset) & 0xFF;
@@ -183,7 +183,7 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
     RrPixel16 *p16 = (RrPixel16 *) im->data;
     unsigned char *p8 = (unsigned char *)im->data;
 
-    if (im->byte_order != RrEndian)
+    if (im->byte_order != LSBFirst)
         swap_byte_order(im);
 
     switch (im->bits_per_pixel) {
@@ -242,3 +242,23 @@ void RrIncreaseDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         g_message("this image bit depth is currently unhandled\n");
     }
 }
+
+int RrColorRed(const RrColor *c)
+{
+    return c->r;
+}
+
+int RrColorGreen(const RrColor *c)
+{
+    return c->g;
+}
+
+int RrColorBlue(const RrColor *c)
+{
+    return c->b;
+}
+
+gulong RrColorPixel(const RrColor *c)
+{
+    return c->pixel;
+}