[Mplayer-cvslog] CVS: main/libvo font_load.c,1.8,1.9 font_load.h,1.3,1.4

[GEREOFFY]

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

Modified Files:
	font_load.c font_load.h 
Log Message:
printf's only if verbose>1

Index: font_load.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** font_load.c	2001/03/29 16:39:37	1.8
--- font_load.c	2001/04/11 00:47:05	1.9
***************
*** 8,12 ****
  char *get_path ( char * );
  
! raw_file* load_raw(char *name){
      int bpp;
      raw_file* raw=malloc(sizeof(raw_file));
--- 8,12 ----
  char *get_path ( char * );
  
! raw_file* load_raw(char *name,int verbose){
      int bpp;
      raw_file* raw=malloc(sizeof(raw_file));
***************
*** 20,24 ****
      raw->c=head[12]*256+head[13];
      if(raw->c>256) return NULL;                 // too many colors!?
!     printf("RAW: %s  %d x %d, %d colors\n",name,raw->w,raw->h,raw->c);
      if(raw->c){
          raw->pal=malloc(raw->c*3);
--- 20,24 ----
      raw->c=head[12]*256+head[13];
      if(raw->c>256) return NULL;                 // too many colors!?
!     if(verbose) printf("RAW: %s  %d x %d, %d colors\n",name,raw->w,raw->h,raw->c);
      if(raw->c){
          raw->pal=malloc(raw->c*3);
***************
*** 35,39 ****
  }
  
! font_desc_t* read_font_desc(char* fname,float factor){
  unsigned char sor[1024];
  unsigned char sor2[1024];
--- 35,39 ----
  }
  
! font_desc_t* read_font_desc(char* fname,float factor,int verbose){
  unsigned char sor[1024];
  unsigned char sor2[1024];
***************
*** 99,103 ****
        if(len && len<63 && p[0][len-1]==']'){
          strcpy(section,p[0]);
!         printf("font: Reading section: %s\n",section);
          if(strcmp(section,"[files]")==0){
              ++fontdb;
--- 99,103 ----
        if(len && len<63 && p[0][len-1]==']'){
          strcpy(section,p[0]);
!         if(verbose) printf("font: Reading section: %s\n",section);
          if(strcmp(section,"[files]")==0){
              ++fontdb;
***************
*** 117,121 ****
  	  }
  	  sprintf(cp2,"%s%s",cp,p[1]);
!           if(!((desc->pic_a[fontdb]=load_raw(cp2)))){
                  printf("Can't load font bitmap: %s\n",p[1]);
  		free(cp);
--- 117,121 ----
  	  }
  	  sprintf(cp2,"%s%s",cp,p[1]);
!           if(!((desc->pic_a[fontdb]=load_raw(cp2,verbose)))){
                  printf("Can't load font bitmap: %s\n",p[1]);
  		free(cp);
***************
*** 135,139 ****
  	  }
  	  sprintf(cp2,"%s%s",cp,p[1]);
!           if(!((desc->pic_b[fontdb]=load_raw(cp2)))){
                  printf("Can't load font bitmap: %s\n",p[1]);
  		free(cp);
--- 135,139 ----
  	  }
  	  sprintf(cp2,"%s%s",cp,p[1]);
!           if(!((desc->pic_b[fontdb]=load_raw(cp2,verbose)))){
                  printf("Can't load font bitmap: %s\n",p[1]);
  		free(cp);
***************
*** 206,210 ****
          int size=desc->pic_a[i]->w*desc->pic_a[i]->h;
          int j;
!         printf("font: resampling alpha by factor %5.3f (%d) ",factor,f);fflush(stdout);
          for(j=0;j<size;j++){
              int x=desc->pic_a[i]->bmp[j];
--- 206,210 ----
          int size=desc->pic_a[i]->w*desc->pic_a[i]->h;
          int j;
!         if(verbose) printf("font: resampling alpha by factor %5.3f (%d) ",factor,f);fflush(stdout);
          for(j=0;j<size;j++){
              int x=desc->pic_a[i]->bmp[j];
***************
*** 228,232 ****
  //            desc->pic_b[i]->bmp[j]=0; // hack
          }
!         printf("DONE!\n");
      }
      if(!desc->height) desc->height=desc->pic_a[i]->h;
--- 228,232 ----
  //            desc->pic_b[i]->bmp[j]=0; // hack
          }
!         if(verbose) printf("DONE!\n");
      }
      if(!desc->height) desc->height=desc->pic_a[i]->h;
***************
*** 251,255 ****
  int main(){
  
! read_font_desc("high_arpi.desc");
  
  }
--- 251,255 ----
  int main(){
  
! read_font_desc("high_arpi.desc",1);
  
  }

Index: font_load.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** font_load.h	2001/03/25 20:37:22	1.3
--- font_load.h	2001/04/11 00:47:05	1.4
***************
*** 20,23 ****
  } font_desc_t;
  
! raw_file* load_raw(char *name);
! font_desc_t* read_font_desc(char* fname,float factor);
--- 20,23 ----
  } font_desc_t;
  
! raw_file* load_raw(char *name,int verbose);
! font_desc_t* read_font_desc(char* fname,float factor,int verbose);


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