oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

fix in pixel logic

Browse source
This commit is contained in:
p.kosyh 2011-04-28 12:17:10 +00:00
parent 4e1e162bca
commit d1a21ba58e
1 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/sdl-instead/graphics.c
View file

@ -585,8 +585,9 @@ img_t gfx_display_alpha(img_t src)
int gfx_get_pixel(img_t src, int x, int y, color_t *color) int gfx_get_pixel(img_t src, int x, int y, color_t *color)
{ {
Uint8 r, g, b, a; Uint8 r, g, b, a;
Uint32 col; Uint32 col = 0;
Uint32 *ptr; Uint8 *ptr;
int bpp;
SDL_Surface *img = Surf(src); SDL_Surface *img = Surf(src);
if (!img) if (!img)
return -1; return -1;
@ -596,9 +597,16 @@ int gfx_get_pixel(img_t src, int x, int y, color_t *color)
if (SDL_LockSurface(img)) if (SDL_LockSurface(img))
return -1; return -1;
ptr = (Uint32*)img->pixels;
ptr += y * img->w + x; if (img->format)
col = *ptr; bpp = img->format->BytesPerPixel;
else
bpp = 1; /* hack? */
ptr = (Uint8*)img->pixels;
ptr += (y * img->w + x) * bpp;
memcpy(&col, ptr, bpp);
SDL_UnlockSurface(img); SDL_UnlockSurface(img);
if (color) if (color)
SDL_GetRGBA(col, img->format, &r, &g, &b, &a); SDL_GetRGBA(col, img->format, &r, &g, &b, &a);
@ -614,8 +622,9 @@ int gfx_get_pixel(img_t src, int x, int y, color_t *color)
int gfx_set_pixel(img_t src, int x, int y, color_t color) int gfx_set_pixel(img_t src, int x, int y, color_t color)
{ {
int bpp;
Uint32 col; Uint32 col;
Uint32 *ptr; Uint8 *ptr;
SDL_Surface *img = Surf(src); SDL_Surface *img = Surf(src);
if (!img) if (!img)
return -1; return -1;
@ -625,20 +634,28 @@ int gfx_set_pixel(img_t src, int x, int y, color_t color)
if (SDL_LockSurface(img)) if (SDL_LockSurface(img))
return -1; return -1;
ptr = (Uint32*)img->pixels;
ptr += y * img->w + x; if (img->format)
bpp = img->format->BytesPerPixel;
else
bpp = 1; /* hack? */
ptr = (Uint8*)img->pixels;
ptr += (y * img->w + x) * bpp;
col = SDL_MapRGBA(img->format, color.r, color.g, color.b, color.a); col = SDL_MapRGBA(img->format, color.r, color.g, color.b, color.a);
*ptr = col; memcpy(ptr, &col, bpp);
SDL_UnlockSurface(img); SDL_UnlockSurface(img);
return 0; return 0;
} }
img_t gfx_alpha_img(img_t src, int alpha) img_t gfx_alpha_img(img_t src, int alpha)
{ {
Uint32 *ptr; Uint8 *ptr;
Uint32 col; Uint32 col;
int size; int size;
int bpp;
SDL_Surface *img; SDL_Surface *img;
if (screen) if (screen)
img = SDL_DisplayFormatAlpha((SDL_Surface*)src); img = SDL_DisplayFormatAlpha((SDL_Surface*)src);
@ -646,17 +663,24 @@ img_t gfx_alpha_img(img_t src, int alpha)
img = gfx_new(Surf(src)->w, Surf(src)->h); img = gfx_new(Surf(src)->w, Surf(src)->h);
if (!img) if (!img)
return NULL; return NULL;
if (img->format)
bpp = img->format->BytesPerPixel;
else
bpp = 1;
SDL_SetAlpha(img, SDL_SRCALPHA, SDL_ALPHA_OPAQUE); SDL_SetAlpha(img, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
if (SDL_LockSurface(img) == 0) { if (SDL_LockSurface(img) == 0) {
ptr = (Uint32*)img->pixels; ptr = (Uint8*)img->pixels;
size = img->w * img->h; size = img->w * img->h;
while (size --) { while (size --) {
Uint8 r, g, b, a; Uint8 r, g, b, a;
col = *ptr; memcpy(&col, ptr, bpp);
SDL_GetRGBA(col, img->format, &r, &g, &b, &a); SDL_GetRGBA(col, img->format, &r, &g, &b, &a);
col = SDL_MapRGBA(img->format, r, g, b, a * alpha / 255); col = SDL_MapRGBA(img->format, r, g, b, a * alpha / 255);
*ptr = col; memcpy(ptr, &col, bpp);
ptr ++; ptr += bpp;
} }
SDL_UnlockSurface(img); SDL_UnlockSurface(img);
} }