Mercurial > mplayer.hg
annotate libvo/font_load.c @ 18721:722ac20fac5f
sync with liba52 0.7.4, patch by Emanuele Giaquinta >emanuele.giaquinta ! gmail * com<
part 2: cosmetic changes
author | rathann |
---|---|
date | Thu, 15 Jun 2006 22:59:40 +0000 |
parents | 3c73573843e2 |
children | ed69754aa58d |
rev | line source |
---|---|
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
5928
diff
changeset
|
1 #include "config.h" |
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
5928
diff
changeset
|
2 |
213 | 3 #include <stdio.h> |
4 #include <stdlib.h> | |
5 #include <string.h> | |
1446 | 6 #include <sys/types.h> |
7 #include <sys/stat.h> | |
8 #include <unistd.h> | |
213 | 9 |
10 #include "font_load.h" | |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
11 #include "mp_msg.h" |
213 | 12 |
2476 | 13 extern char *get_path ( char * ); |
216
338b5664ea13
Search font files in ~/.mplayer/font/ instead of current dir
lgb
parents:
215
diff
changeset
|
14 |
339 | 15 raw_file* load_raw(char *name,int verbose){ |
213 | 16 int bpp; |
17 raw_file* raw=malloc(sizeof(raw_file)); | |
18 unsigned char head[32]; | |
19 FILE *f=fopen(name,"rb"); | |
17791 | 20 if(!f) goto err_out; // can't open |
21 if(fread(head,32,1,f)<1) goto err_out; // too small | |
22 if(memcmp(head,"mhwanh",6)) goto err_out; // not raw file | |
213 | 23 raw->w=head[8]*256+head[9]; |
24 raw->h=head[10]*256+head[11]; | |
25 raw->c=head[12]*256+head[13]; | |
5928
48e91dc9534b
.raw width>=65536 support by Georgi Georgiev <chutz@chubaka.homeip.net>
arpi
parents:
2476
diff
changeset
|
26 if(raw->w == 0) // 2 bytes were not enough for the width... read 4 bytes from the end of the header |
48e91dc9534b
.raw width>=65536 support by Georgi Georgiev <chutz@chubaka.homeip.net>
arpi
parents:
2476
diff
changeset
|
27 raw->w = ((head[28]*0x100 + head[29])*0x100 + head[30])*0x100 + head[31]; |
17791 | 28 if(raw->c>256) goto err_out; // too many colors!? |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
29 mp_msg(MSGT_OSD, MSGL_DBG2, "RAW: %s %d x %d, %d colors\n",name,raw->w,raw->h,raw->c); |
213 | 30 if(raw->c){ |
31 raw->pal=malloc(raw->c*3); | |
32 fread(raw->pal,3,raw->c,f); | |
33 bpp=1; | |
34 } else { | |
35 raw->pal=NULL; | |
36 bpp=3; | |
37 } | |
38 raw->bmp=malloc(raw->h*raw->w*bpp); | |
39 fread(raw->bmp,raw->h*raw->w*bpp,1,f); | |
40 fclose(f); | |
41 return raw; | |
17791 | 42 |
43 err_out: | |
44 if (f) | |
45 fclose(f); | |
46 free(raw); | |
47 return NULL; | |
213 | 48 } |
49 | |
728 | 50 extern int sub_unicode; |
51 | |
339 | 52 font_desc_t* read_font_desc(char* fname,float factor,int verbose){ |
213 | 53 unsigned char sor[1024]; |
54 unsigned char sor2[1024]; | |
55 font_desc_t *desc; | |
17766
b8be9bedc108
initialize f to NULL, needed if desc=malloc... fails
reimar
parents:
14065
diff
changeset
|
56 FILE *f = NULL; |
2222
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
57 char *dn; |
1446 | 58 struct stat fstate; |
213 | 59 char section[64]; |
60 int i,j; | |
61 int chardb=0; | |
62 int fontdb=-1; | |
214 | 63 int version=0; |
8635
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
64 int first=1; |
213 | 65 |
13641 | 66 desc=malloc(sizeof(font_desc_t));if(!desc) goto fail_out; |
213 | 67 memset(desc,0,sizeof(font_desc_t)); |
68 | |
14065 | 69 f=fopen(fname,"rt");if(!f){ mp_msg(MSGT_OSD, MSGL_V, "font: can't open file: %s\n",fname); goto fail_out;} |
213 | 70 |
2222
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
71 i = strlen (fname) - 9; |
2223 | 72 if ((dn = malloc(i+1))){ |
2222
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
73 strncpy (dn, fname, i); |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
74 dn[i]='\0'; |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
75 } |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
76 |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
77 desc->fpath = dn; // search in the same dir as fonts.desc |
1446 | 78 |
2222
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
79 // desc->fpath=get_path("font/"); |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
80 // if (stat(desc->fpath, &fstate)!=0) desc->fpath=DATADIR"/font"; |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
81 |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
82 |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
83 |
1446 | 84 |
213 | 85 // set up some defaults, and erase table |
86 desc->charspace=2; | |
87 desc->spacewidth=12; | |
88 desc->height=0; | |
12609
4be019266884
array initialization fix by SungKwanKang <ksquarekr at yahoo.com>
faust3
parents:
10272
diff
changeset
|
89 for(i=0;i<65536;i++) desc->start[i]=desc->width[i]=desc->font[i]=-1; |
213 | 90 |
91 section[0]=0; | |
92 | |
93 while(fgets(sor,1020,f)){ | |
94 unsigned char* p[8]; | |
95 int pdb=0; | |
96 unsigned char *s=sor; | |
97 unsigned char *d=sor2; | |
98 int ec=' '; | |
99 int id=0; | |
100 sor[1020]=0; | |
8635
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
101 |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
102 /* skip files that look like: TTF (0x00, 0x01), PFM (0x00, 0x01), PFB |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
103 * (0x80, 0x01), PCF (0x01, 0x66), fon ("MZ"), gzipped (0x1f, 0x8b) */ |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
104 |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
105 if (first) { |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
106 if (!sor[0] || sor[1] == 1 || (sor[0] == 'M' && sor[1] == 'Z') || (sor[0] == 0x1f && sor[1] == 0x8b) || (sor[0] == 1 && sor[1] == 0x66)) { |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
107 mp_msg(MSGT_OSD, MSGL_ERR, "%s doesn't look like a font description, ignoring.\n", fname); |
13641 | 108 goto fail_out; |
8635
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
109 } |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
110 first = 0; |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
111 } |
81dbd28ef7c0
these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents:
7122
diff
changeset
|
112 |
213 | 113 p[0]=d;++pdb; |
114 while(1){ | |
115 int c=*s++; | |
116 if(c==0 || c==13 || c==10) break; | |
117 if(!id){ | |
118 if(c==39 || c==34){ id=c;continue;} // idezojel | |
119 if(c==';' || c=='#') break; | |
120 if(c==9) c=' '; | |
121 if(c==' '){ | |
122 if(ec==' ') continue; | |
123 *d=0; ++d; | |
124 p[pdb]=d;++pdb; | |
125 if(pdb>=8) break; | |
126 continue; | |
127 } | |
128 } else { | |
129 if(id==c){ id=0;continue;} // idezojel | |
130 | |
131 } | |
132 *d=c;d++; | |
133 ec=c; | |
134 } | |
135 if(d==sor2) continue; // skip empty lines | |
136 *d=0; | |
137 | |
138 // printf("params=%d sor=%s\n",pdb,sor); | |
139 // for(i=0;i<pdb;i++) printf(" param %d = '%s'\n",i,p[i]); | |
140 | |
141 if(pdb==1 && p[0][0]=='['){ | |
142 int len=strlen(p[0]); | |
143 if(len && len<63 && p[0][len-1]==']'){ | |
144 strcpy(section,p[0]); | |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
145 mp_msg(MSGT_OSD, MSGL_DBG2, "font: Reading section: %s\n",section); |
213 | 146 if(strcmp(section,"[files]")==0){ |
147 ++fontdb; | |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
148 if(fontdb>=16){ mp_msg(MSGT_OSD, MSGL_ERR, "font: Too many bitmaps defined.\n");goto fail_out;} |
213 | 149 } |
150 continue; | |
151 } | |
152 } | |
153 | |
1353 | 154 if(strcmp(section,"[fpath]")==0){ |
155 if(pdb==1){ | |
2222
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
156 if (desc->fpath) |
ddf897c38fb1
read font files from the same dir as font.desc or as specified in font.desc
atlka
parents:
1446
diff
changeset
|
157 free (desc->fpath); // release previously allocated memory |
1353 | 158 desc->fpath=strdup(p[0]); |
159 continue; | |
160 } | |
161 } else | |
162 | |
213 | 163 if(strcmp(section,"[files]")==0){ |
10272
7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
arpi
parents:
8635
diff
changeset
|
164 char *default_dir=MPLAYER_DATADIR "/font"; |
213 | 165 if(pdb==2 && strcmp(p[0],"alpha")==0){ |
1353 | 166 char *cp; |
13641 | 167 if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out; |
1353 | 168 |
169 snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s", | |
170 desc->fpath,p[1]); | |
171 if(!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){ | |
216
338b5664ea13
Search font files in ~/.mplayer/font/ instead of current dir
lgb
parents:
215
diff
changeset
|
172 free(cp); |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
173 if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2))) |
13641 | 174 goto fail_out; |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
175 snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s", |
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
176 default_dir,p[1]); |
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
177 if (!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){ |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
178 mp_msg(MSGT_OSD, MSGL_ERR, "Can't load font bitmap: %s\n",p[1]); |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
179 free(cp); |
13641 | 180 goto fail_out; |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
181 } |
213 | 182 } |
216
338b5664ea13
Search font files in ~/.mplayer/font/ instead of current dir
lgb
parents:
215
diff
changeset
|
183 free(cp); |
213 | 184 continue; |
185 } | |
186 if(pdb==2 && strcmp(p[0],"bitmap")==0){ | |
1353 | 187 char *cp; |
13641 | 188 if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out; |
1353 | 189 |
190 snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s", | |
191 desc->fpath,p[1]); | |
192 if(!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){ | |
216
338b5664ea13
Search font files in ~/.mplayer/font/ instead of current dir
lgb
parents:
215
diff
changeset
|
193 free(cp); |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
194 if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2))) |
13641 | 195 goto fail_out; |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
196 snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s", |
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
197 default_dir,p[1]); |
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
198 if (!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){ |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
199 mp_msg(MSGT_OSD, MSGL_ERR, "Can't load font bitmap: %s\n",p[1]); |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
200 free(cp); |
13641 | 201 goto fail_out; |
2238
be4160d7db48
if not found using fpath try to load font bitmaps from default dir
atlka
parents:
2223
diff
changeset
|
202 } |
213 | 203 } |
216
338b5664ea13
Search font files in ~/.mplayer/font/ instead of current dir
lgb
parents:
215
diff
changeset
|
204 free(cp); |
213 | 205 continue; |
206 } | |
207 } else | |
208 | |
209 if(strcmp(section,"[info]")==0){ | |
214 | 210 if(pdb==2 && strcmp(p[0],"name")==0){ |
211 desc->name=strdup(p[1]); | |
212 continue; | |
213 } | |
214 if(pdb==2 && strcmp(p[0],"descversion")==0){ | |
215 version=atoi(p[1]); | |
216 continue; | |
217 } | |
213 | 218 if(pdb==2 && strcmp(p[0],"spacewidth")==0){ |
219 desc->spacewidth=atoi(p[1]); | |
220 continue; | |
221 } | |
222 if(pdb==2 && strcmp(p[0],"charspace")==0){ | |
223 desc->charspace=atoi(p[1]); | |
224 continue; | |
225 } | |
226 if(pdb==2 && strcmp(p[0],"height")==0){ | |
227 desc->height=atoi(p[1]); | |
228 continue; | |
229 } | |
230 } else | |
214 | 231 |
213 | 232 if(strcmp(section,"[characters]")==0){ |
219 | 233 if(pdb==3){ |
213 | 234 int chr=p[0][0]; |
235 int start=atoi(p[1]); | |
236 int end=atoi(p[2]); | |
727 | 237 if(sub_unicode && (chr>=0x80)) chr=(chr<<8)+p[0][1]; |
706
8a7666a78f83
better .smi support and display two-byte characters- patch by Sunjin Yang
arpi_esp
parents:
340
diff
changeset
|
238 else if(strlen(p[0])!=1) chr=strtol(p[0],NULL,0); |
213 | 239 if(end<start) { |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
240 mp_msg(MSGT_OSD, MSGL_WARN, "error in font desc: end<start for char '%c'\n",chr); |
213 | 241 } else { |
242 desc->start[chr]=start; | |
243 desc->width[chr]=end-start+1; | |
244 desc->font[chr]=fontdb; | |
245 // printf("char %d '%c' start=%d width=%d\n",chr,chr,desc->start[chr],desc->width[chr]); | |
246 ++chardb; | |
247 } | |
248 continue; | |
249 } | |
250 } | |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
251 mp_msg(MSGT_OSD, MSGL_ERR, "Syntax error in font desc: %s",sor); |
13641 | 252 goto fail_out; |
213 | 253 |
254 } | |
255 fclose(f); | |
13641 | 256 f = NULL; |
213 | 257 |
12793
a9429d90157a
avoid using corrupted font descriptions patch by Daniel von Dincklage <danielvd+mpl@cs.colorado.edu>
faust3
parents:
12609
diff
changeset
|
258 if (first == 1) { |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
259 mp_msg(MSGT_OSD, MSGL_ERR, "%s is empty or a directory, ignoring.\n", fname); |
13641 | 260 goto fail_out; |
12793
a9429d90157a
avoid using corrupted font descriptions patch by Daniel von Dincklage <danielvd+mpl@cs.colorado.edu>
faust3
parents:
12609
diff
changeset
|
261 } |
a9429d90157a
avoid using corrupted font descriptions patch by Daniel von Dincklage <danielvd+mpl@cs.colorado.edu>
faust3
parents:
12609
diff
changeset
|
262 |
213 | 263 //printf("font: pos of U = %d\n",desc->start[218]); |
264 | |
265 for(i=0;i<=fontdb;i++){ | |
266 if(!desc->pic_a[i] || !desc->pic_b[i]){ | |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
267 mp_msg(MSGT_OSD, MSGL_ERR, "font: Missing bitmap(s) for sub-font #%d\n",i); |
13641 | 268 goto fail_out; |
213 | 269 } |
249 | 270 //if(factor!=1.0f) |
271 { | |
215 | 272 // re-sample alpha |
273 int f=factor*256.0f; | |
274 int size=desc->pic_a[i]->w*desc->pic_a[i]->h; | |
275 int j; | |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
276 mp_msg(MSGT_OSD, MSGL_DBG2, "font: resampling alpha by factor %5.3f (%d) ",factor,f);fflush(stdout); |
215 | 277 for(j=0;j<size;j++){ |
947
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
728
diff
changeset
|
278 int x=desc->pic_a[i]->bmp[j]; // alpha |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
728
diff
changeset
|
279 int y=desc->pic_b[i]->bmp[j]; // bitmap |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
728
diff
changeset
|
280 |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
728
diff
changeset
|
281 #ifdef FAST_OSD |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
728
diff
changeset
|
282 x=(x<(255-f))?0:1; |
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
728
diff
changeset
|
283 #else |
249 | 284 |
250 | 285 x=255-((x*f)>>8); // scale |
286 //if(x<0) x=0; else if(x>255) x=255; | |
287 //x^=255; // invert | |
288 | |
249 | 289 if(x+y>255) x=255-y; // to avoid overflows |
290 | |
291 //x=0; | |
292 //x=((x*f*(255-y))>>16); | |
293 //x=((x*f*(255-y))>>16)+y; | |
215 | 294 //x=(x*f)>>8;if(x<y) x=y; |
250 | 295 |
249 | 296 if(x<1) x=1; else |
297 if(x>=252) x=0; | |
947
76fd9463b9d3
FAST_OSD option to disable font outline antialiasing
arpi_esp
parents:
728
diff
changeset
|
298 #endif |
250 | 299 |
215 | 300 desc->pic_a[i]->bmp[j]=x; |
250 | 301 // desc->pic_b[i]->bmp[j]=0; // hack |
215 | 302 } |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
303 mp_msg(MSGT_OSD, MSGL_DBG2, "DONE!\n"); |
215 | 304 } |
213 | 305 if(!desc->height) desc->height=desc->pic_a[i]->h; |
306 } | |
307 | |
308 j='_';if(desc->font[j]<0) j='?'; | |
12609
4be019266884
array initialization fix by SungKwanKang <ksquarekr at yahoo.com>
faust3
parents:
10272
diff
changeset
|
309 for(i=0;i<65536;i++) |
213 | 310 if(desc->font[i]<0){ |
311 desc->start[i]=desc->start[j]; | |
312 desc->width[i]=desc->width[j]; | |
313 desc->font[i]=desc->font[j]; | |
314 } | |
315 desc->font[' ']=-1; | |
316 desc->width[' ']=desc->spacewidth; | |
317 | |
13897
41a4fc8421e9
Converted printf calls to mp_msg, reduced verbosity.
diego
parents:
13641
diff
changeset
|
318 mp_msg(MSGT_OSD, MSGL_V, "Font %s loaded successfully! (%d chars)\n",fname,chardb); |
213 | 319 |
320 return desc; | |
13641 | 321 |
322 fail_out: | |
323 if (f) | |
324 fclose(f); | |
325 if (desc->fpath) | |
326 free(desc->fpath); | |
327 if (desc->name) | |
328 free(desc->name); | |
329 if (desc) | |
330 free(desc); | |
331 return NULL; | |
213 | 332 } |
333 | |
334 #if 0 | |
335 int main(){ | |
336 | |
339 | 337 read_font_desc("high_arpi.desc",1); |
213 | 338 |
339 } | |
340 #endif | |
7122
0dc9cb756b68
freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents:
5928
diff
changeset
|
341 |