[MPlayer-cvslog] r23218 - trunk/gui/bitmap.c

[reimar]

Author: reimar
Date: Wed May  2 18:42:31 2007
New Revision: 23218

Log:
Use calloc instead of malloc+memset


Modified:
   trunk/gui/bitmap.c

Modified: trunk/gui/bitmap.c
==============================================================================
--- trunk/gui/bitmap.c	(original)
+++ trunk/gui/bitmap.c	Wed May  2 18:42:31 2007
@@ -74,13 +74,12 @@ static int conv24to32( txSample * bf )
    tmpImage=bf->Image;
    bf->ImageSize=bf->Width * bf->Height * 4;
    bf->BPP=32;
-   if ( ( bf->Image=malloc( bf->ImageSize ) ) == NULL )
+   if ( ( bf->Image=calloc( 1, bf->ImageSize ) ) == NULL )
     {
      free( tmpImage );
      mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[bitmap] not enough memory for image\n" );
      return 1;
     }
-   memset( bf->Image,0,bf->ImageSize );
    for ( c=0,i=0; c < bf->ImageSize; )
     {
      bf->Image[c++]=tmpImage[i++];	//red