[MPlayer-cvslog] r32912 - trunk/gui/skin/font.c

[ib]

Author: ib
Date: Wed Feb 16 17:59:56 2011
New Revision: 32912

Log:
Remove needless pointer check.

Modified:
   trunk/gui/skin/font.c

Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c	Wed Feb 16 17:44:42 2011	(r32911)
+++ trunk/gui/skin/font.c	Wed Feb 16 17:59:56 2011	(r32912)
@@ -125,8 +125,7 @@ int fntRead( char * path,char * fname )
         mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[font] image file: %s\n",tmp );
         if ( skinBPRead( tmp,&Fonts[id]->Bitmap ) )
          {
-          if (Fonts[id]->Bitmap.Image)
-            gfree((void **) &Fonts[id]->Bitmap.Image);
+          gfree((void **) &Fonts[id]->Bitmap.Image);
           gfree((void **) &Fonts[id]);
           fclose(f);
           return -4;
@@ -245,7 +244,7 @@ txSample * fntRender( wItem * item,int p
  fbw=Fonts[id]->Bitmap.Width;
  th=fntTextHeight(id, txt);
 
- if (item->Bitmap.Image && (item->height != th))
+ if (item->height != th)
    gfree((void **) &item->Bitmap.Image);
 
  if ( item->Bitmap.Image == NULL )