diff options
| author | atlka <atlka@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-17 15:15:30 +0000 |
|---|---|---|
| committer | atlka <atlka@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-17 15:15:30 +0000 |
| commit | e0501da664420bf81de33557f17a24b09d3278e4 (patch) | |
| tree | 488d16f6c1047fac956c7de2c495cdff5b7caabe /libvo | |
| parent | 9e5dde93d437d240c73837ecb2d2290da0a74316 (diff) | |
| download | mpv-e0501da664420bf81de33557f17a24b09d3278e4.tar.bz2 mpv-e0501da664420bf81de33557f17a24b09d3278e4.tar.xz | |
if not found using fpath try to load font bitmaps from default dir
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2239 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/font_load.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c index d4d69f0580..75bc155ee1 100644 --- a/libvo/font_load.c +++ b/libvo/font_load.c @@ -139,6 +139,7 @@ while(fgets(sor,1020,f)){ } else if(strcmp(section,"[files]")==0){ + char *default_dir=DATADIR"/font"; if(pdb==2 && strcmp(p[0],"alpha")==0){ char *cp; if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) return NULL; @@ -146,9 +147,16 @@ while(fgets(sor,1020,f)){ snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s", desc->fpath,p[1]); if(!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){ - printf("Can't load font bitmap: %s\n",p[1]); free(cp); - return NULL; + if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2))) + return NULL; + snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s", + default_dir,p[1]); + if (!((desc->pic_a[fontdb]=load_raw(cp,verbose)))){ + printf("Can't load font bitmap: %s\n",p[1]); + free(cp); + return NULL; + } } free(cp); continue; @@ -160,9 +168,16 @@ while(fgets(sor,1020,f)){ snprintf(cp,strlen(desc->fpath)+strlen(p[1])+2,"%s/%s", desc->fpath,p[1]); if(!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){ - printf("Can't load font bitmap: %s\n",p[1]); free(cp); - return NULL; + if (!(cp=malloc(strlen(default_dir)+strlen(p[1])+2))) + return NULL; + snprintf(cp,strlen(default_dir)+strlen(p[1])+2,"%s/%s", + default_dir,p[1]); + if (!((desc->pic_b[fontdb]=load_raw(cp,verbose)))){ + printf("Can't load font bitmap: %s\n",p[1]); + free(cp); + return NULL; + } } free(cp); continue; |