diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-20 00:01:09 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-07-20 00:01:09 +0000 |
commit | 7882ea9badf366fbb6f06b17ea6321c54c7c8466 (patch) | |
tree | 04f4fb162431a7f43a8f29b1a5bc64575fc72436 /libvo/font_load.c | |
parent | 56c90f534975a3bb9cab5c0b1abda9010f0c50c1 (diff) | |
download | mpv-7882ea9badf366fbb6f06b17ea6321c54c7c8466.tar.bz2 mpv-7882ea9badf366fbb6f06b17ea6321c54c7c8466.tar.xz |
Applied DATADIR patch by Vladimir Kushnir
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1354 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/font_load.c')
-rw-r--r-- | libvo/font_load.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c index 466882ec71..ed7463d945 100644 --- a/libvo/font_load.c +++ b/libvo/font_load.c @@ -110,41 +110,40 @@ while(fgets(sor,1020,f)){ } } + if(strcmp(section,"[fpath]")==0){ + if(pdb==1){ + desc->fpath=strdup(p[0]); + continue; + } + } else + if(strcmp(section,"[files]")==0){ if(pdb==2 && strcmp(p[0],"alpha")==0){ - char *cp,*cp2; - if (!(cp=get_path("font/"))) return NULL; - if (!(cp2=malloc(strlen(cp)+strlen(p[1])+1))) { - free(cp); - return NULL; - } - sprintf(cp2,"%s%s",cp,p[1]); - if(!((desc->pic_a[fontdb]=load_raw(cp2,verbose)))){ + char *cp; + if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) return NULL; + + 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); - free(cp2); return NULL; } free(cp); - free(cp2); continue; } if(pdb==2 && strcmp(p[0],"bitmap")==0){ - char *cp,*cp2; - if (!(cp=get_path("font/"))) return NULL; - if (!(cp2=malloc(strlen(cp)+strlen(p[1])+1))) { - free(cp); - return NULL; - } - sprintf(cp2,"%s%s",cp,p[1]); - if(!((desc->pic_b[fontdb]=load_raw(cp2,verbose)))){ + char *cp; + if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) return NULL; + + 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); - free(cp2); return NULL; } free(cp); - free(cp2); continue; } } else |