annotate libvo/font_load.c @ 28063:a318969a4f45

Set the base size window manager hint, otherwise some subtract the minimum size of 4x4 from the numbers displayed to the user which might be confusing. Based on patch by Bert Wesarg [bert wesarg googlemail com].
author reimar
date Fri, 05 Dec 2008 19:01:49 +0000
parents 6bc98534572a
children 0f4e0c39c20e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
3 #include <stdio.h>
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
4 #include <stdlib.h>
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
5 #include <string.h>
1446
a49fd85fc431 DATADIR/font/ patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1359
diff changeset
6 #include <sys/types.h>
a49fd85fc431 DATADIR/font/ patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1359
diff changeset
7 #include <sys/stat.h>
a49fd85fc431 DATADIR/font/ patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1359
diff changeset
8 #include <unistd.h>
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
9
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
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
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
12
339
e7e89cd4169f printf's only if verbose>1
arpi_esp
parents: 250
diff changeset
13 raw_file* load_raw(char *name,int verbose){
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
14 int bpp;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
15 raw_file* raw=malloc(sizeof(raw_file));
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
16 unsigned char head[32];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
17 FILE *f=fopen(name,"rb");
17791
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
18 if(!f) goto err_out; // can't open
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
19 if(fread(head,32,1,f)<1) goto err_out; // too small
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
20 if(memcmp(head,"mhwanh",6)) goto err_out; // not raw file
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
21 raw->w=head[8]*256+head[9];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
22 raw->h=head[10]*256+head[11];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
23 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
24 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
25 raw->w = ((head[28]*0x100 + head[29])*0x100 + head[30])*0x100 + head[31];
17791
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
26 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
27 mp_msg(MSGT_OSD, MSGL_DBG2, "RAW: %s %d x %d, %d colors\n",name,raw->w,raw->h,raw->c);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
28 if(raw->c){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
29 raw->pal=malloc(raw->c*3);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
30 fread(raw->pal,3,raw->c,f);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
31 bpp=1;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
32 } else {
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
33 raw->pal=NULL;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
34 bpp=3;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
35 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
36 raw->bmp=malloc(raw->h*raw->w*bpp);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
37 fread(raw->bmp,raw->h*raw->w*bpp,1,f);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
38 fclose(f);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
39 return raw;
17791
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
40
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
41 err_out:
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
42 if (f)
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
43 fclose(f);
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
44 free(raw);
3c73573843e2 free resources when load_raw fails
reimar
parents: 17766
diff changeset
45 return NULL;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
46 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
47
728
138d38a5915a fixed extern
arpi_esp
parents: 727
diff changeset
48 extern int sub_unicode;
138d38a5915a fixed extern
arpi_esp
parents: 727
diff changeset
49
18980
ed69754aa58d Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents: 17791
diff changeset
50 font_desc_t* read_font_desc(const char* fname,float factor,int verbose){
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
51 unsigned char sor[1024];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
52 unsigned char sor2[1024];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
53 font_desc_t *desc;
17766
b8be9bedc108 initialize f to NULL, needed if desc=malloc... fails
reimar
parents: 14065
diff changeset
54 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
55 char *dn;
24245
188964a48302 warning fix:
diego
parents: 24242
diff changeset
56 //struct stat fstate;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
57 char section[64];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
58 int i,j;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
59 int chardb=0;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
60 int fontdb=-1;
214
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
61 int version=0;
8635
81dbd28ef7c0 these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents: 7122
diff changeset
62 int first=1;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
63
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
64 desc=malloc(sizeof(font_desc_t));if(!desc) goto fail_out;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
65 memset(desc,0,sizeof(font_desc_t));
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
66
14065
de6ed5d2805d more verbosity spam fixes
rfelker
parents: 13897
diff changeset
67 f=fopen(fname,"rt");if(!f){ mp_msg(MSGT_OSD, MSGL_V, "font: can't open file: %s\n",fname); goto fail_out;}
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
68
2222
ddf897c38fb1 read font files from the same dir as font.desc or as specified in font.desc
atlka
parents: 1446
diff changeset
69 i = strlen (fname) - 9;
2223
560267b2ede8 cosmetic changes
atlka
parents: 2222
diff changeset
70 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
71 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
72 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
73 }
ddf897c38fb1 read font files from the same dir as font.desc or as specified in font.desc
atlka
parents: 1446
diff changeset
74
ddf897c38fb1 read font files from the same dir as font.desc or as specified in font.desc
atlka
parents: 1446
diff changeset
75 desc->fpath = dn; // search in the same dir as fonts.desc
1446
a49fd85fc431 DATADIR/font/ patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1359
diff changeset
76
2222
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=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
78 // 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
79
ddf897c38fb1 read font files from the same dir as font.desc or as specified in font.desc
atlka
parents: 1446
diff changeset
80
ddf897c38fb1 read font files from the same dir as font.desc or as specified in font.desc
atlka
parents: 1446
diff changeset
81
1446
a49fd85fc431 DATADIR/font/ patch by Adam Tla/lka atlka@pg.gda.pl
arpi
parents: 1359
diff changeset
82
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
83 // set up some defaults, and erase table
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
84 desc->charspace=2;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
85 desc->spacewidth=12;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
86 desc->height=0;
12609
4be019266884 array initialization fix by SungKwanKang <ksquarekr at yahoo.com>
faust3
parents: 10272
diff changeset
87 for(i=0;i<65536;i++) desc->start[i]=desc->width[i]=desc->font[i]=-1;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
88
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
89 section[0]=0;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
90
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
91 while(fgets(sor,1020,f)){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
92 unsigned char* p[8];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
93 int pdb=0;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
94 unsigned char *s=sor;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
95 unsigned char *d=sor2;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
96 int ec=' ';
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
97 int id=0;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
98 sor[1020]=0;
8635
81dbd28ef7c0 these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents: 7122
diff changeset
99
81dbd28ef7c0 these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents: 7122
diff changeset
100 /* 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
101 * (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
102
81dbd28ef7c0 these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents: 7122
diff changeset
103 if (first) {
81dbd28ef7c0 these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents: 7122
diff changeset
104 if (!sor[0] || sor[1] == 1 || (sor[0] == 'M' && sor[1] == 'Z') || (sor[0] == 0x1f && sor[1] == 0x8b) || (sor[0] == 1 && sor[1] == 0x66)) {
19551
4186a45ce6c8 Clarify messages.
diego
parents: 19386
diff changeset
105 mp_msg(MSGT_OSD, MSGL_ERR, "%s doesn't look like a bitmap font description, ignoring.\n", fname);
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
106 goto fail_out;
8635
81dbd28ef7c0 these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents: 7122
diff changeset
107 }
81dbd28ef7c0 these patches let ,,oldstyle'' and freetype subtitle renderers live
arpi
parents: 7122
diff changeset
108 first = 0;
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
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
111 p[0]=d;++pdb;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
112 while(1){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
113 int c=*s++;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
114 if(c==0 || c==13 || c==10) break;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
115 if(!id){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
116 if(c==39 || c==34){ id=c;continue;} // idezojel
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
117 if(c==';' || c=='#') break;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
118 if(c==9) c=' ';
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
119 if(c==' '){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
120 if(ec==' ') continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
121 *d=0; ++d;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
122 p[pdb]=d;++pdb;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
123 if(pdb>=8) break;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
124 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
125 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
126 } else {
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
127 if(id==c){ id=0;continue;} // idezojel
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
128
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
129 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
130 *d=c;d++;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
131 ec=c;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
132 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
133 if(d==sor2) continue; // skip empty lines
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
134 *d=0;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
135
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
136 // printf("params=%d sor=%s\n",pdb,sor);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
137 // for(i=0;i<pdb;i++) printf(" param %d = '%s'\n",i,p[i]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
138
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
139 if(pdb==1 && p[0][0]=='['){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
140 int len=strlen(p[0]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
141 if(len && len<63 && p[0][len-1]==']'){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
142 strcpy(section,p[0]);
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
143 mp_msg(MSGT_OSD, MSGL_DBG2, "font: Reading section: %s\n",section);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
144 if(strcmp(section,"[files]")==0){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
145 ++fontdb;
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
146 if(fontdb>=16){ mp_msg(MSGT_OSD, MSGL_ERR, "font: Too many bitmaps defined.\n");goto fail_out;}
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
147 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
148 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
149 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
150 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
151
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
152 if(strcmp(section,"[fpath]")==0){
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
153 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
154 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
155 free (desc->fpath); // release previously allocated memory
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
156 desc->fpath=strdup(p[0]);
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
157 continue;
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
158 }
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
159 } else
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
160
25335
6bc98534572a SYS_AMIGAOS4 --> __AMIGAOS4__
diego
parents: 25100
diff changeset
161 #ifdef __AMIGAOS4__
19386
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
162 #define FONT_PATH_SEP ""
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
163 #else
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
164 //! path seperator for font paths, may not be more than one character
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
165 #define FONT_PATH_SEP "/"
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
166 #endif
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
167
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
168 if(strcmp(section,"[files]")==0){
19386
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
169 char *default_dir=MPLAYER_DATADIR FONT_PATH_SEP "font";
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
170 if(pdb==2 && strcmp(p[0],"alpha")==0){
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
171 char *cp;
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
172 if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out;
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
173
19386
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
174 snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
175 desc->fpath,p[1]);
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
176 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
177 free(cp);
2238
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
178 if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
179 goto fail_out;
19386
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
180 snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
2238
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
181 default_dir,p[1]);
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
182 if (!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
183 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
184 free(cp);
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
185 goto fail_out;
2238
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
186 }
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
187 }
216
338b5664ea13 Search font files in ~/.mplayer/font/ instead of current dir
lgb
parents: 215
diff changeset
188 free(cp);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
189 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
190 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
191 if(pdb==2 && strcmp(p[0],"bitmap")==0){
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
192 char *cp;
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
193 if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) goto fail_out;
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
194
19386
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
195 snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
1353
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
196 desc->fpath,p[1]);
c3e3b0ae4d06 Applied DATADIR patch by Vladimir Kushnir
arpi
parents: 947
diff changeset
197 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
198 free(cp);
2238
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
199 if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
200 goto fail_out;
19386
01853e915882 Make path separator for font path a define and set it to a better value for AMIGAOS
reimar
parents: 18980
diff changeset
201 snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
2238
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
202 default_dir,p[1]);
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
203 if (!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
204 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
205 free(cp);
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
206 goto fail_out;
2238
be4160d7db48 if not found using fpath try to load font bitmaps from default dir
atlka
parents: 2223
diff changeset
207 }
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
208 }
216
338b5664ea13 Search font files in ~/.mplayer/font/ instead of current dir
lgb
parents: 215
diff changeset
209 free(cp);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
210 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
211 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
212 } else
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
214 if(strcmp(section,"[info]")==0){
214
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
215 if(pdb==2 && strcmp(p[0],"name")==0){
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
216 desc->name=strdup(p[1]);
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
217 continue;
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
218 }
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
219 if(pdb==2 && strcmp(p[0],"descversion")==0){
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
220 version=atoi(p[1]);
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
221 continue;
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
222 }
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
223 if(pdb==2 && strcmp(p[0],"spacewidth")==0){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
224 desc->spacewidth=atoi(p[1]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
225 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
226 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
227 if(pdb==2 && strcmp(p[0],"charspace")==0){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
228 desc->charspace=atoi(p[1]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
229 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
230 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
231 if(pdb==2 && strcmp(p[0],"height")==0){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
232 desc->height=atoi(p[1]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
233 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
234 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
235 } else
214
09d0f437b817 desc fileformat changes
arpi_esp
parents: 213
diff changeset
236
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
237 if(strcmp(section,"[characters]")==0){
219
bc5c75b7a401 hex charcode support
arpi_esp
parents: 217
diff changeset
238 if(pdb==3){
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
239 int chr=p[0][0];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
240 int start=atoi(p[1]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
241 int end=atoi(p[2]);
727
cc208ebcb9f6 Deals with unicode/nounicode.
atmosfear
parents: 706
diff changeset
242 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
243 else if(strlen(p[0])!=1) chr=strtol(p[0],NULL,0);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
244 if(end<start) {
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
245 mp_msg(MSGT_OSD, MSGL_WARN, "error in font desc: end<start for char '%c'\n",chr);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
246 } else {
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
247 desc->start[chr]=start;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
248 desc->width[chr]=end-start+1;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
249 desc->font[chr]=fontdb;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
250 // printf("char %d '%c' start=%d width=%d\n",chr,chr,desc->start[chr],desc->width[chr]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
251 ++chardb;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
252 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
253 continue;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
254 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
255 }
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
256 mp_msg(MSGT_OSD, MSGL_ERR, "Syntax error in font desc: %s",sor);
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
257 goto fail_out;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
258
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
259 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
260 fclose(f);
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
261 f = NULL;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
262
12793
a9429d90157a avoid using corrupted font descriptions patch by Daniel von Dincklage <danielvd+mpl@cs.colorado.edu>
faust3
parents: 12609
diff changeset
263 if (first == 1) {
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
264 mp_msg(MSGT_OSD, MSGL_ERR, "%s is empty or a directory, ignoring.\n", fname);
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
265 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
266 }
a9429d90157a avoid using corrupted font descriptions patch by Daniel von Dincklage <danielvd+mpl@cs.colorado.edu>
faust3
parents: 12609
diff changeset
267
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
268 //printf("font: pos of U = %d\n",desc->start[218]);
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
269
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
270 for(i=0;i<=fontdb;i++){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
271 if(!desc->pic_a[i] || !desc->pic_b[i]){
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
272 mp_msg(MSGT_OSD, MSGL_ERR, "font: Missing bitmap(s) for sub-font #%d\n",i);
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
273 goto fail_out;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
274 }
249
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
275 //if(factor!=1.0f)
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
276 {
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
277 // re-sample alpha
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
278 int f=factor*256.0f;
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
279 int size=desc->pic_a[i]->w*desc->pic_a[i]->h;
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
280 int j;
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
281 mp_msg(MSGT_OSD, MSGL_DBG2, "font: resampling alpha by factor %5.3f (%d) ",factor,f);fflush(stdout);
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
282 for(j=0;j<size;j++){
947
76fd9463b9d3 FAST_OSD option to disable font outline antialiasing
arpi_esp
parents: 728
diff changeset
283 int x=desc->pic_a[i]->bmp[j]; // alpha
76fd9463b9d3 FAST_OSD option to disable font outline antialiasing
arpi_esp
parents: 728
diff changeset
284 int y=desc->pic_b[i]->bmp[j]; // bitmap
76fd9463b9d3 FAST_OSD option to disable font outline antialiasing
arpi_esp
parents: 728
diff changeset
285
76fd9463b9d3 FAST_OSD option to disable font outline antialiasing
arpi_esp
parents: 728
diff changeset
286 #ifdef FAST_OSD
76fd9463b9d3 FAST_OSD option to disable font outline antialiasing
arpi_esp
parents: 728
diff changeset
287 x=(x<(255-f))?0:1;
76fd9463b9d3 FAST_OSD option to disable font outline antialiasing
arpi_esp
parents: 728
diff changeset
288 #else
249
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
289
250
d4f711fde94b optimized alpha resampling
arpi_esp
parents: 249
diff changeset
290 x=255-((x*f)>>8); // scale
d4f711fde94b optimized alpha resampling
arpi_esp
parents: 249
diff changeset
291 //if(x<0) x=0; else if(x>255) x=255;
d4f711fde94b optimized alpha resampling
arpi_esp
parents: 249
diff changeset
292 //x^=255; // invert
d4f711fde94b optimized alpha resampling
arpi_esp
parents: 249
diff changeset
293
249
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
294 if(x+y>255) x=255-y; // to avoid overflows
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
295
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
296 //x=0;
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
297 //x=((x*f*(255-y))>>16);
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
298 //x=((x*f*(255-y))>>16)+y;
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
299 //x=(x*f)>>8;if(x<y) x=y;
250
d4f711fde94b optimized alpha resampling
arpi_esp
parents: 249
diff changeset
300
249
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
301 if(x<1) x=1; else
2dadc379a934 OSD/SUB image quality & speed improvement
arpi_esp
parents: 219
diff changeset
302 if(x>=252) x=0;
947
76fd9463b9d3 FAST_OSD option to disable font outline antialiasing
arpi_esp
parents: 728
diff changeset
303 #endif
250
d4f711fde94b optimized alpha resampling
arpi_esp
parents: 249
diff changeset
304
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
305 desc->pic_a[i]->bmp[j]=x;
250
d4f711fde94b optimized alpha resampling
arpi_esp
parents: 249
diff changeset
306 // desc->pic_b[i]->bmp[j]=0; // hack
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
307 }
13897
41a4fc8421e9 Converted printf calls to mp_msg, reduced verbosity.
diego
parents: 13641
diff changeset
308 mp_msg(MSGT_OSD, MSGL_DBG2, "DONE!\n");
215
09d565842a33 font alpha resampling, see -ffactor
arpi_esp
parents: 214
diff changeset
309 }
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
310 if(!desc->height) desc->height=desc->pic_a[i]->h;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
311 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
312
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
313 j='_';if(desc->font[j]<0) j='?';
12609
4be019266884 array initialization fix by SungKwanKang <ksquarekr at yahoo.com>
faust3
parents: 10272
diff changeset
314 for(i=0;i<65536;i++)
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
315 if(desc->font[i]<0){
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
316 desc->start[i]=desc->start[j];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
317 desc->width[i]=desc->width[j];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
318 desc->font[i]=desc->font[j];
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
319 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
320 desc->font[' ']=-1;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
321 desc->width[' ']=desc->spacewidth;
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
322
19551
4186a45ce6c8 Clarify messages.
diego
parents: 19386
diff changeset
323 mp_msg(MSGT_OSD, MSGL_V, "Bitmap font %s loaded successfully! (%d chars)\n",fname,chardb);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
324
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
325 return desc;
13641
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
326
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
327 fail_out:
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
328 if (f)
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
329 fclose(f);
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
330 if (desc->fpath)
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
331 free(desc->fpath);
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
332 if (desc->name)
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
333 free(desc->name);
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
334 if (desc)
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
335 free(desc);
a22f1b86ec0f some memory leaks fixed
reimar
parents: 12793
diff changeset
336 return NULL;
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
337 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
338
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
339 #if 0
25100
531116b7693d main() --> main(void)
diego
parents: 24245
diff changeset
340 int main(void){
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
341
339
e7e89cd4169f printf's only if verbose>1
arpi_esp
parents: 250
diff changeset
342 read_font_desc("high_arpi.desc",1);
213
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
343
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
344 }
6ec8f6ab6cb1 subtitle+OSD font support
arpi_esp
parents:
diff changeset
345 #endif
7122
0dc9cb756b68 freetype 2.0/2.1+ support - disabled by default until bugs fixed
arpi
parents: 5928
diff changeset
346