summaryrefslogtreecommitdiffstats
path: root/Gui/bitmap.c
diff options
context:
space:
mode:
authorreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-13 16:17:24 +0000
committerreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-13 16:17:24 +0000
commit241bfa8a0ca7c52c66fb48f6b9d97a0c7d8db4c2 (patch)
tree557c1d309a8eb4a749e016858ba12b5fd311d3fc /Gui/bitmap.c
parentad0c589f6bfcaed2ecd0caf06c6dc473d040142c (diff)
downloadmpv-241bfa8a0ca7c52c66fb48f6b9d97a0c7d8db4c2.tar.bz2
mpv-241bfa8a0ca7c52c66fb48f6b9d97a0c7d8db4c2.tar.xz
drops casts from void * on malloc/calloc from the gui code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19066 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/bitmap.c')
-rw-r--r--Gui/bitmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gui/bitmap.c b/Gui/bitmap.c
index 4714cae563..4367d99415 100644
--- a/Gui/bitmap.c
+++ b/Gui/bitmap.c
@@ -38,7 +38,7 @@ int pngRead( unsigned char * fname,txSample * bf )
png_read_info( png,info );
png_get_IHDR( png,info,&bf->Width,&bf->Height,&bf->BPP,&color,NULL,NULL,NULL );
- row_p=(png_bytep *)malloc( sizeof( png_bytep ) * bf->Height );
+ row_p=malloc( sizeof( png_bytep ) * bf->Height );
if ( !row_p )
{
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] not enough memory for row buffer\n" );
@@ -198,7 +198,7 @@ void Convert32to1( txSample * in,txSample * out,int adaptivlimit )
out->BPP=1;
out->ImageSize=(out->Width * out->Height + 7) / 8;
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c32to1] imagesize: %d\n",out->ImageSize );
- out->Image=(char *)calloc( 1,out->ImageSize );
+ out->Image=calloc( 1,out->ImageSize );
if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotEnoughMemoryC32To1 );
{
int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0; int nothaveshape = 1;
@@ -221,7 +221,7 @@ void Convert1to32( txSample * in,txSample * out )
out->Height=in->Height;
out->BPP=32;
out->ImageSize=out->Width * out->Height * 4;
- out->Image=(char *)calloc( 1,out->ImageSize );
+ out->Image=calloc( 1,out->ImageSize );
mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c1to32] imagesize: %d\n",out->ImageSize );
if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_WARN,MSGTR_NotEnoughMemoryC1To32 );
{