mirror of
https://github.com/nzp-team/fteqw.git
synced 2025-01-31 04:30:38 +00:00
Renamed pixel to _pixel to avoid clashes on archs where pixel is a builtin (Altivec)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2044 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
parent
06dc2878c9
commit
1f15a044d3
1 changed files with 8 additions and 8 deletions
|
@ -1113,7 +1113,7 @@ qboolean Media_ShowFilm(void)
|
||||||
unsigned char *pa=roqfilm->y[0];
|
unsigned char *pa=roqfilm->y[0];
|
||||||
unsigned char *pb=roqfilm->u[0];
|
unsigned char *pb=roqfilm->u[0];
|
||||||
unsigned char *pc=roqfilm->v[0];
|
unsigned char *pc=roqfilm->v[0];
|
||||||
int pixel=0;
|
int _pixel=0;
|
||||||
int num_columns=(roqfilm->width)>>1;
|
int num_columns=(roqfilm->width)>>1;
|
||||||
int y;
|
int y;
|
||||||
int x;
|
int x;
|
||||||
|
@ -1141,19 +1141,19 @@ qboolean Media_ShowFilm(void)
|
||||||
b = 116130 * u;
|
b = 116130 * u;
|
||||||
|
|
||||||
t=r+y1;
|
t=r+y1;
|
||||||
framedata[pixel] =(unsigned char) LIMIT(t);
|
framedata[_pixel] =(unsigned char) LIMIT(t);
|
||||||
t=g+y1;
|
t=g+y1;
|
||||||
framedata[pixel+1] =(unsigned char) LIMIT(t);
|
framedata[_pixel+1] =(unsigned char) LIMIT(t);
|
||||||
t=b+y1;
|
t=b+y1;
|
||||||
framedata[pixel+2] =(unsigned char) LIMIT(t);
|
framedata[_pixel+2] =(unsigned char) LIMIT(t);
|
||||||
|
|
||||||
t=r+y2;
|
t=r+y2;
|
||||||
framedata[pixel+4] =(unsigned char) LIMIT(t);
|
framedata[_pixel+4] =(unsigned char) LIMIT(t);
|
||||||
t=g+y2;
|
t=g+y2;
|
||||||
framedata[pixel+5] =(unsigned char) LIMIT(t);
|
framedata[_pixel+5] =(unsigned char) LIMIT(t);
|
||||||
t=b+y2;
|
t=b+y2;
|
||||||
framedata[pixel+6] =(unsigned char) LIMIT(t);
|
framedata[_pixel+6] =(unsigned char) LIMIT(t);
|
||||||
pixel+=8;
|
_pixel+=8;
|
||||||
|
|
||||||
}
|
}
|
||||||
if(y & 0x01) { pb += num_columns; pc += num_columns; }
|
if(y & 0x01) { pb += num_columns; pc += num_columns; }
|
||||||
|
|
Loading…
Reference in a new issue