Mercurial > mplayer.hg
changeset 1109:a013b2124f05
-Wall like fixes
| author | al3x |
|---|---|
| date | Tue, 12 Jun 2001 14:03:18 +0000 |
| parents | 268c1d28cff2 |
| children | 71b8911ec3da |
| files | libvo/sub.c libvo/vo_gl.c libvo/vo_pgm.c libvo/x11_common.c |
| diffstat | 4 files changed, 8 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/sub.c Tue Jun 12 12:06:09 2001 +0000 +++ b/libvo/sub.c Tue Jun 12 14:03:18 2001 +0000 @@ -32,7 +32,6 @@ int vo_osd_progbar_value=100; // 0..255 static void vo_draw_text_progbar(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ - int len=strlen(vo_osd_text); int i; int y=dys/2; int x; @@ -100,10 +99,8 @@ for(i=0;i<vo_sub->lines;i++){ unsigned char* text=vo_sub->text[i]; int len=strlen(text); - int j,k; + int j; int xsize=-vo_font->charspace; - int x=0; - int lastStripPosition=-1; int previousStrip=0; int lastxsize=0; @@ -119,7 +116,7 @@ lastxsize=xsize; } xsize+=w+vo_font->charspace; - if (dxs<xsize & lastStripPosition>0) + if (dxs<xsize && lastStripPosition>0) { xsize=lastxsize; j=lastStripPosition; @@ -153,7 +150,7 @@ lastxsize=xsize; } xsize+=w+vo_font->charspace; - if ((dxs<xsize & lastStripPosition>0)| j==len-1) + if ((dxs<xsize && lastStripPosition>0) || j==len-1) { if (j==len-1) lastStripPosition=len; else xsize=lastxsize; @@ -188,6 +185,8 @@ static int draw_alpha_init_flag=0; +extern void vo_draw_alpha_init(); + void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)){ if(!vo_font) return; // no font @@ -210,5 +209,3 @@ } } - -
--- a/libvo/vo_gl.c Tue Jun 12 12:06:09 2001 +0000 +++ b/libvo/vo_gl.c Tue Jun 12 14:03:18 2001 +0000 @@ -43,7 +43,7 @@ }; /* private prototypes */ -static void Display_Image (unsigned char *ImageData); +// static void Display_Image (unsigned char *ImageData); /* local data */ static unsigned char *ImageData=NULL; @@ -57,7 +57,7 @@ static XWindowAttributes attribs; static int X_already_started = 0; -static int texture_id=1; +//static int texture_id=1; static GLXContext wsGLXContext; //XVisualInfo * wsVisualInfo; @@ -105,7 +105,7 @@ XVisualInfo *vinfo; XEvent xev; - XGCValues xgcv; +// XGCValues xgcv; XSetWindowAttributes xswa; unsigned long xswamask; @@ -414,7 +414,6 @@ uint8_t *de=&ImageData[3*image_width]; for(i=0;i<image_height;i++){ - int j; uint8_t *d=ImageData; while(d<de){ d[0]=s[2];