[MPlayer-cvslog] CVS: main/libvo font_load_ft.c,1.17,1.18

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv20811/libvo

Modified Files:
	font_load_ft.c 
Log Message:
The fix in mp_msg.c avoids a core dump when iconv_open() fails, the other
just makes it possible to compile if USE_ICONV is undefined.

Patch by Bjorn Sandell (biorn _At_ chalmers _Dot_ se).


Index: font_load_ft.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load_ft.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- font_load_ft.c	9 Feb 2006 14:07:58 -0000	1.17
+++ font_load_ft.c	24 Mar 2006 02:31:29 -0000	1.18
@@ -18,7 +18,9 @@
 #include <math.h>
 #include <string.h>
 
+#ifdef USE_ICONV
 #include <iconv.h>
+#endif
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
@@ -731,7 +733,7 @@
     return 0;
 }
 
-
+#ifdef USE_ICONV
 /* decode from 'encoding' to unicode */
 static FT_ULong decode_char(iconv_t *cd, char c) {
     FT_ULong o;
@@ -830,6 +832,7 @@
 
     return i;
 }
+#endif
 
 static font_desc_t* init_font_desc(void)
 {
@@ -1015,6 +1018,7 @@
     }
     desc->face_cnt++;
 
+#ifdef USE_ICONV
     if (unicode) {
 	charset_size = prepare_charset_unicode(face, my_charset, my_charcodes);
     } else {
@@ -1030,6 +1034,9 @@
 	free_font_desc(desc);
 	return NULL;
     }
+#else
+    return NULL;
+#endif
 
 //    fprintf(stderr, "fg: prepare t = %lf\n", GetTimer()-t);