summaryrefslogtreecommitdiffstats
path: root/libvo/font_load.c
diff options
context:
space:
mode:
Diffstat (limited to 'libvo/font_load.c')
-rw-r--r--libvo/font_load.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c
index ad2311e37a..e7d36d8a2c 100644
--- a/libvo/font_load.c
+++ b/libvo/font_load.c
@@ -91,13 +91,13 @@ if ((dn = malloc(i+1))){
}
desc->fpath = dn; // search in the same dir as fonts.desc
-
+
// desc->fpath=get_path("font/");
// if (stat(desc->fpath, &fstate)!=0) desc->fpath=DATADIR"/font";
-
-
-
+
+
+
// set up some defaults, and erase table
desc->charspace=2;
desc->spacewidth=12;
@@ -117,7 +117,7 @@ while(fgets(sor,1020,f)){
/* skip files that look like: TTF (0x00, 0x01), PFM (0x00, 0x01), PFB
* (0x80, 0x01), PCF (0x01, 0x66), fon ("MZ"), gzipped (0x1f, 0x8b) */
-
+
if (first) {
if (!sor[0] || sor[1] == 1 || (sor[0] == 'M' && sor[1] == 'Z') || (sor[0] == 0x1f && sor[1] == 0x8b) || (sor[0] == 1 && sor[1] == 0x66)) {
mp_msg(MSGT_OSD, MSGL_ERR, "%s doesn't look like a bitmap font description, ignoring.\n", fname);
@@ -125,7 +125,7 @@ while(fgets(sor,1020,f)){
}
first = 0;
}
-
+
p[0]=d;++pdb;
while(1){
int c=*s++;
@@ -143,14 +143,14 @@ while(fgets(sor,1020,f)){
}
} else {
if(id==c){ id=0;continue;} // idezojel
-
+
}
*d=c;d++;
ec=c;
}
if(d==sor2) continue; // skip empty lines
*d=0;
-
+
// printf("params=%d sor=%s\n",pdb,sor);
// for(i=0;i<pdb;i++) printf(" param %d = '%s'\n",i,p[i]);
@@ -166,7 +166,7 @@ while(fgets(sor,1020,f)){
continue;
}
}
-
+
if(strcmp(section,"[fpath]")==0){
if(pdb==1){
if (desc->fpath)
@@ -174,7 +174,7 @@ while(fgets(sor,1020,f)){
desc->fpath=strdup(p[0]);
continue;
}
- } else
+ } else
#ifdef __AMIGAOS4__
#define FONT_PATH_SEP ""
@@ -193,7 +193,7 @@ while(fgets(sor,1020,f)){
desc->fpath,p[1]);
if(!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){
free(cp);
- if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
+ if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
goto fail_out;
snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
default_dir,p[1]);
@@ -214,7 +214,7 @@ while(fgets(sor,1020,f)){
desc->fpath,p[1]);
if(!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){
free(cp);
- if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
+ if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2)))
goto fail_out;
snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s" FONT_PATH_SEP "%s",
default_dir,p[1]);
@@ -310,8 +310,8 @@ for(i=0;i<=fontdb;i++){
//x^=255; // invert
if(x+y>255) x=255-y; // to avoid overflows
-
- //x=0;
+
+ //x=0;
//x=((x*f*(255-y))>>16);
//x=((x*f*(255-y))>>16)+y;
//x=(x*f)>>8;if(x<y) x=y;