Mercurial > mplayer.hg

changeset 32825:097e8f1feabe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove needless pointer check.
author ib
date Wed, 16 Feb 2011 16:59:56 +0000
parents 880e112a9a71
children 9ce10a293f56
files gui/skin/font.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/skin/font.c	Wed Feb 16 16:44:42 2011 +0000
+++ b/gui/skin/font.c	Wed Feb 16 16:59:56 2011 +0000
@@ -125,8 +125,7 @@
         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 @@
  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 )