r2156

[dslinux_gpf at dslinux.in-berlin.de]

Author: gpf
Date: 2008-03-08 04:07:00 +0100 (Sat, 08 Mar 2008)
New Revision: 2156

Log:
fix 16bit alpha setting

Modified: trunk/lib/sdl/src/src/video/SDL_blit.h
===================================================================
--- trunk/lib/sdl/src/src/video/SDL_blit.h	2008-03-08 00:04:43 UTC (rev 2155)
+++ trunk/lib/sdl/src/src/video/SDL_blit.h	2008-03-08 03:07:00 UTC (rev 2156)
@@ -166,7 +166,7 @@
 } while(0)
 
 /* Assemble R-G-B values into a specified pixel format and store them */
-#ifdef __NDS__ // FIXME
+#if defined(__NDS__) || defined(__uClinux__) // FIXME
 #define PIXEL_FROM_RGB(Pixel, fmt, r, g, b)				\
 {									\
 	Pixel = ((r>>fmt->Rloss)<<fmt->Rshift)|				\
@@ -180,7 +180,7 @@
 		((g>>fmt->Gloss)<<fmt->Gshift)|				\
 		((b>>fmt->Bloss)<<fmt->Bshift);				\
 }
-#endif // __NDS__ FIXME
+#endif // __NDS__ and DSLINUX FIXME
 #define RGB565_FROM_RGB(Pixel, r, g, b)					\
 {									\
 	Pixel = ((r>>3)<<11)|((g>>2)<<5)|(b>>3);			\
@@ -330,7 +330,7 @@
 } while(0)
 
 /* FIXME: this isn't correct, especially for Alpha (maximum != 255) */
-#ifdef __NDS__ // FIXME
+#if defined(__NDS__) || defined(__uClinux__) // FIXME
 #define PIXEL_FROM_RGBA(Pixel, fmt, r, g, b, a)				\
 {									\
 	Pixel = ((r>>fmt->Rloss)<<fmt->Rshift)|				\
@@ -346,7 +346,7 @@
 		((b>>fmt->Bloss)<<fmt->Bshift)|				\
 		((a>>fmt->Aloss)<<fmt->Ashift);				\
 }
-#endif // __NDS__ FIXME
+#endif // __NDS__ or DSLINUX FIXME
 #define ASSEMBLE_RGBA(buf, bpp, fmt, r, g, b, a)			\
 {									\
 	switch (bpp) {							\