m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory alignment problem that caused wrong color columns when loading 24bit imges on Caanoo. Thanks PheeL for report

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1638 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-10-25 21:15:43 +00:00
parent a28f574b3b
commit e5272e74f7
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sdlscreen.c
View File

@ -23,6 +23,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <SDL.h> #include <SDL.h>
#include <SDL_endian.h>
#if defined(__WIN32__) #if defined(__WIN32__)
#include <windows.h> #include <windows.h>
#endif #endif
@ -218,13 +219,26 @@ byte Get_SDL_pixel_8(SDL_Surface *bmp, int x, int y)
/// Reads a pixel in a multi-byte SDL surface. /// Reads a pixel in a multi-byte SDL surface.
dword Get_SDL_pixel_hicolor(SDL_Surface *bmp, int x, int y) dword Get_SDL_pixel_hicolor(SDL_Surface *bmp, int x, int y)
{ {
byte * ptr;
switch(bmp->format->BytesPerPixel) switch(bmp->format->BytesPerPixel)
{ {
case 4: case 4:
default: default:
return *((dword *)((byte *)bmp->pixels+(y*bmp->pitch+x*4))); return *((dword *)((byte *)bmp->pixels+(y*bmp->pitch+x*4)));
case 3: case 3:
return *(((dword *)((byte *)bmp->pixels+(y*bmp->pitch+x*3)))) & 0xFFFFFF; // Reading a 4-byte number starting at an address that isn't a multiple
// of 2 (or 4?) is not supported on Caanoo console at least (ARM CPU)
// So instead, we will read the 3 individual bytes, and re-construct the
// "dword" expected by SDL.
ptr = ((byte *)bmp->pixels)+(y*bmp->pitch+x*3);
#ifdef SDL_LIL_ENDIAN
// Read ABC, output _CBA : Most Significant Byte is zero.
return (*ptr) | (*(ptr+1)<<8) | (*(ptr+2)<<16);
#else
// Read ABC, output ABC_ : Least Significant Byte is zero.
return ((*ptr)<<24) | (*(ptr+1)<<16) | (*(ptr+2)<<8);
#endif
case 2: case 2:
return *((word *)((byte *)bmp->pixels+(y*bmp->pitch+x*2))); return *((word *)((byte *)bmp->pixels+(y*bmp->pitch+x*2)));
} }