[MPlayer-cvslog] r36221 - in trunk/libvo: gl_common.c gl_common.h matrixview.c vo_gl.c

[Reimar Döffinger]

On Sat, May 04, 2013 at 10:45:01PM +0400, Yuriy Kaminskiy wrote:
> reimar wrote:
> > Author: reimar
> > Date: Sat May  4 17:20:42 2013
> > New Revision: 36221
> > 
> > Log:
> > Avoid glColor4f, use glColor4ub instead.
> > 
> > Modified:
> >    trunk/libvo/gl_common.c
> >    trunk/libvo/gl_common.h
> >    trunk/libvo/matrixview.c
> >    trunk/libvo/vo_gl.c
> > 
> > Modified: trunk/libvo/matrixview.c
> > ==============================================================================
> > --- trunk/libvo/matrixview.c	Sat May  4 15:28:14 2013	(r36220)
> > +++ trunk/libvo/matrixview.c	Sat May  4 17:20:42 2013	(r36221)
> > @@ -71,13 +71,13 @@ static void draw_char(int num, float lig
> >  
> >      num &= 63;
> >      //light = light / 255;        //light=7-light;num+=(light*60);
> > -    light = light / 255 * matrix_brightness;
> > +    light *= matrix_brightness;
> >      num2 = num / 10;
> >      num3 = num - (num2 * 10);
> >      ty = (float)num2 / 7;
> >      tx = (float)num3 / 10;
> >      mpglNormal3f(0.0f, 0.0f, 1.0f);        // Needed for lighting
> > -    mpglColor4f(0.0, 1.0, 0.0, light);        // Basic polygon color
>                              ^^^
> > +    mpglColor4ub(0, 255, 255, light);        // Basic polygon color
>                             ^^^
> This change looks a bit suspicious (but, probably, not worth changing back).

The Matrix in cyan definitely isn't right.
I changed it back, though I admit cyan is less critical that if I had
made it pink :-)