[maemo-commits] [maemo-commits] r17299 - in projects/haf/trunk/libmatchbox2: . matchbox/theme-engines

[From: subversion at stage.maemo.org]

Author: tthurman
Date: 2009-01-27 17:35:54 +0200 (Tue, 27 Jan 2009)
New Revision: 17299

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c
Log:
	* matchbox/theme-engines/mb-wm-theme-png.c: remove byte order
	check which only worked in scratchbox :/



Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================
--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-01-27 14:59:51 UTC (rev 17298)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-01-27 15:35:54 UTC (rev 17299)
@@ -1,3 +1,8 @@
+2009-01-27  Thomas Thurman  <thomas.thurman at collabora.co.uk>
+
+	* matchbox/theme-engines/mb-wm-theme-png.c: remove byte order
+	check which only worked in scratchbox :/
+
 2009-01-26  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	Release 0.2.14

Modified: projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c	2009-01-27 14:59:51 UTC (rev 17298)
+++ projects/haf/trunk/libmatchbox2/matchbox/theme-engines/mb-wm-theme-png.c	2009-01-27 15:35:54 UTC (rev 17299)
@@ -1336,15 +1336,8 @@
     for (x = 0; x < width; x++)
       {
 	unsigned char a, r, g, b;
-#if BYTE_ORDER==LITTLE_ENDIAN
-	/* This is probably an Intel scratchbox */
-	b = *p++; g = *p++; r = *p++; a = *p++;
-#elif BYTE_ORDER==BIG_ENDIAN
 	/* This is probably the ARM */
 	r = *p++; g = *p++; b = *p++; a = *p++;
-#else
-#error "Could not determine byte order!  Please define BYTE_ORDER to BIG_ENDIAN or LITTLE_ENDIAN"
-#endif
 	r = (r * (a + 1)) / 256;
 	g = (g * (a + 1)) / 256;
 	b = (b * (a + 1)) / 256;