X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=3e9199c30495aedc08967fcdf7fb8c42486e9f08;hb=e9a8e272c06fd0cc1a2d93418d261886e786b16f;hp=b485685379c390c427b3900dcadaaf6af2ffaa85;hpb=16066ed282bbc70aa3cefa81a674a8c6e8fe69b8;p=chaz%2Fopenbox

diff --git a/render/color.c b/render/color.c
index b4856853..3e9199c3 100644
--- a/render/color.c
+++ b/render/color.c
@@ -75,14 +75,18 @@ void RrReduceDepth(const RrInstance *inst, RrPixel32 *data, XImage *im)
         if ((RrRedOffset(inst) != RrDefaultRedOffset) ||
             (RrBlueOffset(inst) != RrDefaultBlueOffset) ||
             (RrGreenOffset(inst) != RrDefaultGreenOffset)) {
+            g_message("CONVERSION %d->%d %d->%d %d->%d",
+                      RrDefaultRedOffset, RrRedOffset(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;
                     g = (data[x] >> RrDefaultGreenOffset) & 0xFF;
                     b = (data[x] >> RrDefaultBlueOffset) & 0xFF;
-                    p32[x] = (r << RrRedShift(inst))
-                           + (g << RrGreenShift(inst))
-                           + (b << RrBlueShift(inst));
+                    p32[x] = (r << RrRedOffset(inst))
+                           + (g << RrGreenOffset(inst))
+                           + (b << RrBlueOffset(inst));
                 }
                 data += im->width;
                 p32 += im->width;
@@ -179,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) {
@@ -238,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;
+}