[MPlayer-cvslog] r33208 - trunk/gui/util/bitmap.c

[ib]

Author: ib
Date: Mon Apr  4 16:29:52 2011
New Revision: 33208

Log:
Rename conv24to32() Convert24to32().

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

Modified:
   trunk/gui/util/bitmap.c

Modified: trunk/gui/util/bitmap.c
==============================================================================
--- trunk/gui/util/bitmap.c	Mon Apr  4 16:14:10 2011	(r33207)
+++ trunk/gui/util/bitmap.c	Mon Apr  4 16:29:52 2011	(r33208)
@@ -118,7 +118,7 @@ static int pngRead(unsigned char *fname,
     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 @@ static int conv24to32(txSample *bf)
         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 @@ static int conv24to32(txSample *bf)
         free(tmpImage);
     }
 
-    return 0;
+    return 1;
 }
 
 static void Normalize(txSample *bf)
@@ -202,7 +202,7 @@ int bpRead(char *fname, txSample *bf)
         return -1;
     }
 
-    if (conv24to32(bf))
+    if (!Convert24to32(bf))
         return -8;
 
     Normalize(bf);