From 9c982475feceb77852f2b840b0f5309570352d9a Mon Sep 17 00:00:00 2001 From: "wrenczes@gmail.com" Date: Wed, 6 Oct 2010 09:22:44 +0000 Subject: [PATCH] Some minor casting issues that trip up the 0.9.6 pspsdk when compiling. --- JGE/include/JTypes.h | 5 +++-- JGE/src/JGfx.cpp | 2 +- projects/mtg/src/TranslateKeys.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h index 86a35469c..3e5bc2eb7 100644 --- a/JGE/include/JTypes.h +++ b/JGE/include/JTypes.h @@ -137,15 +137,16 @@ typedef uint32_t u32; #if defined (ABGR8888) + #define PIXEL_TYPE u32 #ifndef ARGB - #define ARGB(a, r, g, b) ((a << 24) | (b << 16) | (g << 8) | r) // macro to assemble pixels in correct format + #define ARGB(a, r, g, b) (PIXEL_TYPE)((a << 24) | (b << 16) | (g << 8) | r) // macro to assemble pixels in correct format #endif #define MAKE_COLOR(a, c) (a << 24 | c) #define MASK_ALPHA 0xFF000000 // masks for accessing individual pixels #define MASK_BLUE 0x00FF0000 #define MASK_GREEN 0x0000FF00 #define MASK_RED 0x000000FF - #define PIXEL_TYPE u32 + #define PIXEL_SIZE 4 #define PIXEL_FORMAT PSP_DISPLAY_PIXEL_FORMAT_8888 diff --git a/JGE/src/JGfx.cpp b/JGE/src/JGfx.cpp index c8083a9a2..135d29ecc 100644 --- a/JGE/src/JGfx.cpp +++ b/JGE/src/JGfx.cpp @@ -1482,7 +1482,7 @@ int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bg if (buffer) { - p32 = (u32*) buffer; + p32 = (DWORD*) buffer; } //if((*image_data = (pixel *)malloc(sizeof(pixel) * GifFileIn->Image.Width * GifFileIn->Image.Height)) == NULL) diff --git a/projects/mtg/src/TranslateKeys.cpp b/projects/mtg/src/TranslateKeys.cpp index 4883b6384..54653c779 100644 --- a/projects/mtg/src/TranslateKeys.cpp +++ b/projects/mtg/src/TranslateKeys.cpp @@ -99,7 +99,7 @@ const KeyRep& translateKey(LocalKeySym key) { else { char* str = NEW char[11]; - sprintf(str, "%d", key); + sprintf(str, "%d", (int) key); fattable[key] = make_pair(str, static_cast(static_cast(NULL))); } res = fattable.find(key);