--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403516
This commit is contained in:
Sam Lantinga 2009-01-30 06:38:44 +00:00
parent 9bb60da027
commit d0b1ee8e2f
2 changed files with 52 additions and 51 deletions

View file

@ -150,7 +150,7 @@ X11_SetDisplayGammaRamp(_THIS, Uint16 * ramp)
}
/* remember the new ramp */
if (cmapTable[j].ramp == NULL) {
Uint16 * newramp = SDL_malloc(SDL_GammaRampSize);
Uint16 *newramp = SDL_malloc(SDL_GammaRampSize);
if (NULL == newramp) {
SDL_SetError("Out of memory in X11_TrackColormap()");
return -1;

View file

@ -265,7 +265,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
/* what if ncolors != (1 << nbits)? That can happen on a
true PseudoColor display. I'm assuming that we will
always have ncolors == (1 << nbits)*/
always have ncolors == (1 << nbits) */
/* I'm making a lot of assumptions here. */
@ -301,7 +301,8 @@ X11_CreateWindow(_THIS, SDL_Window * window)
for (r = 0; r < rmax; r++) {
for (g = 0; g < gmax; g++) {
for (b = 0; b < bmax; b++) {
colorcells[pix].pixel = (r << rshift) | (g << gshift) | (b << bshift);
colorcells[pix].pixel =
(r << rshift) | (g << gshift) | (b << bshift);
colorcells[pix].red = (0xffff * r) / rmask;
colorcells[pix].green = (0xffff * g) / gmask;
colorcells[pix].blue = (0xffff * b) / bmask;