[Mplayer-cvslog] CVS: main/libvo font_load.c,1.4,1.5

[Gabor Lenart]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv32423/main/libvo

Modified Files:
	font_load.c 
Log Message:
Search font files in ~/.mplayer/font/ instead of current dir

Index: font_load.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** font_load.c	2001/03/26 17:16:27	1.4
--- font_load.c	2001/03/26 20:28:09	1.5
***************
*** 110,115 ****
    if(strcmp(section,"[files]")==0){
        if(pdb==2 && strcmp(p[0],"alpha")==0){
!     	  char *cp=get_path("font/");
! 	  char *cp2=malloc(strlen(cp)+strlen(p[1])+1);
  	  sprintf(cp2,"%s%s",cp,p[1]);
            if(!((desc->pic_a[fontdb]=load_raw(cp2)))){
--- 110,119 ----
    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)))){
***************
*** 124,129 ****
        }
        if(pdb==2 && strcmp(p[0],"bitmap")==0){
!     	  char *cp=get_path("font/");
! 	  char *cp2=malloc(strlen(cp)+strlen(p[1])+1);
  	  sprintf(cp2,"%s%s",cp,p[1]);
            if(!((desc->pic_b[fontdb]=load_raw(cp2)))){
--- 128,137 ----
        }
        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)))){


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog