Mercurial > mplayer.hg

changeset 36653:123bf21dc4ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revise non-FreeType part of mplayerLoadFont(). Use free_font_desc() instead of freeing by ourselves.
author ib
date Sun, 26 Jan 2014 16:57:18 +0000
parents aff6fa4a1f70
children b1ef9c82a90c
files gui/interface.c
diffstat 1 files changed, 1 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Sun Jan 26 16:53:21 2014 +0000
+++ b/gui/interface.c	Sun Jan 26 16:57:18 2014 +0000
@@ -1087,29 +1087,7 @@
 
     force_load_font = 1;
 #else
-    if (vo_font) {
-        int i;
-
-        free(vo_font->name);
-        free(vo_font->fpath);
-
-        for (i = 0; i < 16; i++) {
-            if (vo_font->pic_a[i]) {
-                free(vo_font->pic_a[i]->bmp);
-                free(vo_font->pic_a[i]->pal);
-            }
-        }
-
-        for (i = 0; i < 16; i++) {
-            if (vo_font->pic_b[i]) {
-                free(vo_font->pic_b[i]->bmp);
-                free(vo_font->pic_b[i]->pal);
-            }
-        }
-
-        free(vo_font);
-        vo_font = NULL;
-    }
+    free_font_desc(vo_font);
 
     if (font_name) {
         vo_font = read_font_desc(font_name, font_factor, 0);