Mercurial > mplayer.hg

changeset 33582:d9a4365d1006

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui: Rename TRANSPARENT #define to MP_TRANSPARENT. TRANSPARENT is defined in windows.h and clashes for the Win32 GUI.
author diego
date Sun, 19 Jun 2011 17:33:11 +0000
parents 7b168fb5ee98
children a39c61198f93
files gui/skin/font.c gui/util/bitmap.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/skin/font.c	Sun Jun 19 17:33:06 2011 +0000
+++ b/gui/skin/font.c	Sun Jun 19 17:33:11 2011 +0000
@@ -312,7 +312,7 @@
     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) {
--- a/gui/util/bitmap.h	Sun Jun 19 17:33:06 2011 +0000
+++ b/gui/util/bitmap.h	Sun Jun 19 17:33:11 2011 +0000
@@ -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;