Mercurial > mplayer.hg

diff gui/skin/skin.c @ 33114:5ad451a5ebec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove useless warning message. Instead, add debug message and return whether conversion was successful or not and use the return code to issue an appropriate error message.
author ib
date Mon, 04 Apr 2011 12:40:20 +0000
parents e9e5ee3a1a82
children 5f3171d4d7a4
line wrap: on
line diff
--- a/gui/skin/skin.c	Mon Apr 04 12:14:26 2011 +0000
+++ b/gui/skin/skin.c	Mon Apr 04 12:40:20 2011 +0000
@@ -277,7 +277,10 @@
 
     if (!is_sub) {
 #ifdef CONFIG_XSHAPE
-        Convert32to1(&currWin->Bitmap, &currWin->Mask, 0x00ff00ff);
+        if (!Convert32to1(&currWin->Bitmap, &currWin->Mask, 0x00ff00ff)) {
+            skin_error(MSGTR_SKIN_NotEnoughMemory);
+            return 1;
+        }
         mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     mask: %lux%lu\n", currWin->Mask.Width, currWin->Mask.Height);
 #else
         currWin->Mask.Image = NULL;