From: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Mon, 27 Sep 2010 18:12:50 +0000 (-0400)
Subject: Fix icons.c test for 64-bit platforms
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=6e5de3b57eb1b39c2c3bd170c2dfca205d4a49ff

Fix icons.c test for 64-bit platforms
---

diff --git a/tests/icons.c b/tests/icons.c
index af13e0b5..e2477c25 100644
--- a/tests/icons.c
+++ b/tests/icons.c
@@ -70,6 +70,7 @@ int main(int argc, char **argv)
     Pixmap p;
     Cursor cur;
     XEvent ev;
+    unsigned int bs = sizeof(long);
 
     printf("Click on a window with an icon...\n");
 
@@ -132,10 +133,10 @@ int main(int argc, char **argv)
         i[image]->byte_order = LSBFirst;
         i[image]->data = (char*)prop_return[image];
         for (j = 0; j < w*h; j++) {
-            unsigned char alpha = (unsigned char)i[image]->data[j*4+3];
-            unsigned char r = (unsigned char) i[image]->data[j*4+0];
-            unsigned char g = (unsigned char) i[image]->data[j*4+1];
-            unsigned char b = (unsigned char) i[image]->data[j*4+2];
+            unsigned char alpha = (unsigned char)i[image]->data[j*bs+3];
+            unsigned char r = (unsigned char) i[image]->data[j*bs+0];
+            unsigned char g = (unsigned char) i[image]->data[j*bs+1];
+            unsigned char b = (unsigned char) i[image]->data[j*bs+2];
 
             // background color
             unsigned char bgr = 0;