this is going to break the kernel/ building.

[chaz/openbox] / render / image.c

diff --git a/render/image.c b/render/image.c
index 7b58712bde9bd3a890249cc440d00ef5ed8f40d7..5209d1207c42a40949f526245cc35a2ddc336200 100644 (file)
--- a/render/image.c
+++ b/render/image.c
@@ -1,19 +1,15 @@
-#include <glib.h>
 #include "../kernel/geom.h"
 #include "image.h"
+#include "color.h"
 
-void image_draw(pixel32 *target, TextureRGBA *rgba, Rect *position,
-                Rect *surarea)
-{
-    gulong *draw = rgba->data;
-    guint c, i, e, t, sfw, sfh;
-    sfw = position->width;
-    sfh = position->height;
+#include <glib.h>
 
-    /* it would be nice if this worked, but this function is well broken in
-       these circumstances. */
-    g_assert(position->width == surarea->width &&
-             position->height == surarea->height);
+void image_draw(pixel32 *target, RrTextureRGBA *rgba, Rect *area)
+{
+    pixel32 *draw = rgba->data;
+    gint c, i, e, t, sfw, sfh;
+    sfw = area->width;
+    sfh = area->height;
 
     g_assert(rgba->data != NULL);
 
@@ -28,7 +24,7 @@ void image_draw(pixel32 *target, TextureRGBA *rgba, Rect *position,
         /* scale it and cache it */
         if (rgba->cache != NULL)
             g_free(rgba->cache);
-        rgba->cache = g_new(unsigned long, sfw * sfh);
+        rgba->cache = g_new(pixel32, sfw * sfh);
         rgba->cwidth = sfw;
         rgba->cheight = sfh;
         for (i = 0, c = 0, e = sfw*sfh; i < e; ++i) {
@@ -47,17 +43,17 @@ void image_draw(pixel32 *target, TextureRGBA *rgba, Rect *position,
             draw = rgba->cache;
 
         /* apply the alpha channel */
-        for (i = 0, c = 0, t = position->x, e = sfw*sfh; i < e; ++i, ++t) {
+        for (i = 0, c = 0, t = area->x, e = sfw*sfh; i < e; ++i, ++t) {
             guchar alpha, r, g, b, bgr, bgg, bgb;
 
-            alpha = draw[i] >> 24;
-            r = draw[i] >> 16;
-            g = draw[i] >> 8;
-            b = draw[i];
+            alpha = draw[i] >> default_alpha_offset;
+            r = draw[i] >> default_red_offset;
+            g = draw[i] >> default_green_offset;
+            b = draw[i] >> default_blue_offset;
 
             if (c >= sfw) {
                 c = 0;
-                t += surarea->width - sfw;
+                t += area->width - sfw;
             }
 
             /* background color */