[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.54,1.55 vo_mga.c,1.35,1.36

[Richard Felker CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv18673/libvo

Modified Files:
	mga_common.c vo_mga.c 
Log Message:
fix panscan font resizing with vo_mga


Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- mga_common.c	29 Mar 2003 19:56:31 -0000	1.54
+++ mga_common.c	26 Apr 2003 16:56:21 -0000	1.55
@@ -27,7 +27,7 @@
 
 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
     uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31;
-//    x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
+    x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x);
     switch(mga_vid_config.format){
     case MGA_VID_FORMAT_YV12:
     case MGA_VID_FORMAT_IYUV:
@@ -45,8 +45,8 @@
 
 static void draw_osd(void)
 {
-    vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
-//    vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha);
+//    vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha);
+    vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha);
 }
 
 

Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- vo_mga.c	11 Nov 2002 15:20:26 -0000	1.35
+++ vo_mga.c	26 Apr 2003 16:56:21 -0000	1.36
@@ -70,6 +70,7 @@
 		printf("vo_mga aspect(): resized to %dx%d\n",d_width,d_height);
 	}
 
+	vo_dwidth=d_width; vo_dheight=d_height;
 	mga_vid_config.dest_width = d_width;
 	mga_vid_config.dest_height= d_height;
 	mga_vid_config.x_org= 0; // (720-mga_vid_config.dest_width)/2;