Mercurial > mplayer.hg

changeset 34464:251018f5254b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary #ifdef. If there is no XShape extension, Mask.Image will be ignored (by wsSetShape()) anyway.
author ib
date Thu, 12 Jan 2012 16:14:20 +0000
parents c44d95befb0a
children 3c1a1038bfc7
files gui/skin/skin.c
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/skin/skin.c	Thu Jan 12 16:08:07 2012 +0000
+++ b/gui/skin/skin.c	Thu Jan 12 16:14:20 2012 +0000
@@ -354,15 +354,11 @@
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     bitmap: %dx%d\n", currWin->width, currWin->height);
 
     if (!is_sub) {
-#ifdef CONFIG_XSHAPE
         if (!bpRenderMask(&currWin->Bitmap, &currWin->Mask)) {
             skin_error(MSGTR_SKIN_NotEnoughMemory);
             return 1;
         }
         mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     mask: %lux%lu\n", currWin->Mask.Width, currWin->Mask.Height);
-#else
-        currWin->Mask.Image = NULL;
-#endif
     }
 
     if (is_bar)