# HG changeset patch
# User ib
# Date 1301927392 0
# Node ID 7623be6c1f0e17c704d9b50e9c7020b4878df9c1
# Parent  e1403616342f4572b6e5815861275215f509281d
Rename conv24to32() Convert24to32().

Besides, invert return code to conform with Convert32to1().

diff -r e1403616342f -r 7623be6c1f0e gui/util/bitmap.c
--- a/gui/util/bitmap.c	Mon Apr 04 14:14:10 2011 +0000
+++ b/gui/util/bitmap.c	Mon Apr 04 14:29:52 2011 +0000
@@ -118,7 +118,7 @@
     return !(decode_ok && bf->BPP);
 }
 
-static int conv24to32(txSample *bf)
+static int Convert24to32(txSample *bf)
 {
     unsigned char *tmpImage;
     unsigned int i, c;
@@ -132,7 +132,7 @@
         if (!bf->Image) {
             free(tmpImage);
             mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] not enough memory: %lu\n", bf->ImageSize);
-            return 1;
+            return 0;
         }
 
         mp_dbg(MSGT_GPLAYER, MSGL_DBG2, "[bitmap] 32 bpp conversion size: %lu\n", bf->ImageSize);
@@ -143,7 +143,7 @@
         free(tmpImage);
     }
 
-    return 0;
+    return 1;
 }
 
 static void Normalize(txSample *bf)
@@ -202,7 +202,7 @@
         return -1;
     }
 
-    if (conv24to32(bf))
+    if (!Convert24to32(bf))
         return -8;
 
     Normalize(bf);