ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(PS3) use uint32_t * for pixels member as well for PS3

This commit is contained in:
TwinAphex51224 2012-01-26 02:53:59 +01:00 committed by Themaister
parent 15c5c69241
commit 7af7d55068
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/image.h
View File

@ -25,11 +25,7 @@ struct texture_image
{ {
unsigned width; unsigned width;
unsigned height; unsigned height;
#ifdef __CELLOS_LV2__
uint8_t *pixels;
#else
uint32_t *pixels; uint32_t *pixels;
#endif
}; };
bool texture_image_load(const char *path, struct texture_image* img); bool texture_image_load(const char *path, struct texture_image* img);

4
ps3/image.c
View File

@ -128,7 +128,7 @@ static bool ps3graphics_load_jpeg(const char * path, struct texture_image *out_i
goto error; goto error;
dCtrlParam.outputBytesPerLine = outParam.outputWidth * 4; dCtrlParam.outputBytesPerLine = outParam.outputWidth * 4;
ret = cellJpgDecDecodeData(mHandle, sHandle, out_img->pixels, &dCtrlParam, &dOutInfo); ret = cellJpgDecDecodeData(mHandle, sHandle, (uint8_t*)out_img->pixels, &dCtrlParam, &dOutInfo);
if (ret != CELL_OK || dOutInfo.status != CELL_JPGDEC_DEC_STATUS_FINISH) if (ret != CELL_OK || dOutInfo.status != CELL_JPGDEC_DEC_STATUS_FINISH)
goto error; goto error;
@ -219,7 +219,7 @@ static bool ps3graphics_load_png(const char * path, struct texture_image *out_im
goto error; goto error;
dCtrlParam.outputBytesPerLine = outParam.outputWidth * 4; dCtrlParam.outputBytesPerLine = outParam.outputWidth * 4;
ret = cellPngDecDecodeData(mHandle, sHandle, out_img->pixels, &dCtrlParam, &dOutInfo); ret = cellPngDecDecodeData(mHandle, sHandle, (uint8_t*)out_img->pixels, &dCtrlParam, &dOutInfo);
if (ret != CELL_OK || dOutInfo.status != CELL_PNGDEC_DEC_STATUS_FINISH) if (ret != CELL_OK || dOutInfo.status != CELL_PNGDEC_DEC_STATUS_FINISH)