[MPlayer-cvslog] r33670 - in trunk/gui: skin/font.c util/bitmap.h

[diego]

Author: diego
Date: Sun Jun 19 19:33:11 2011
New Revision: 33670

Log:
gui: Rename TRANSPARENT #define to MP_TRANSPARENT.

TRANSPARENT is defined in windows.h and clashes for the Win32 GUI.

Modified:
   trunk/gui/skin/font.c
   trunk/gui/util/bitmap.h

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Sun Jun 19 19:33:06 2011	(r33669)
+++ trunk/gui/skin/font.c	Sun Jun 19 19:33:11 2011	(r33670)
@@ -312,7 +312,7 @@ guiImage *fntRender(wItem *item, int px,
     ibuf = (uint32_t *)Fonts[id]->Bitmap.Image;
 
     for (i = 0; i < item->Bitmap.ImageSize / 4; i++)
-        obuf[i] = TRANSPARENT;
+        obuf[i] = MP_TRANSPARENT;
 
     if (tw <= iw) {
         switch (item->align) {

Modified: trunk/gui/util/bitmap.h
==============================================================================
--- trunk/gui/util/bitmap.h	Sun Jun 19 19:33:06 2011	(r33669)
+++ trunk/gui/util/bitmap.h	Sun Jun 19 19:33:11 2011	(r33670)
@@ -19,11 +19,11 @@
 #ifndef MPLAYER_GUI_BITMAP_H
 #define MPLAYER_GUI_BITMAP_H
 
-#define TRANSPARENT  0xffff00ff   // transparent color (opaque fuchsia/magenta)
-#define ALPHA_OPAQUE 0xff000000
+#define MP_TRANSPARENT 0xffff00ff // transparent color (opaque fuchsia/magenta)
+#define ALPHA_OPAQUE   0xff000000
 
 // for legacy reasons, we must treat all kind of fuchsia/magenta as transparent
-#define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == TRANSPARENT)
+#define IS_TRANSPARENT(c) ((ALPHA_OPAQUE | (c)) == MP_TRANSPARENT)
 
 typedef struct {
     unsigned long Width;