From 789ad60723ef737a7cdc7890b4d58331e605f82e Mon Sep 17 00:00:00 2001 From: "jean.chalard" Date: Wed, 29 Apr 2009 10:00:56 +0000 Subject: [PATCH] J : * Update for interface change. - The new arguments, being PSP-specific, are ignored (same as windows version). It might be surprising and not very readable, but it does what makes the most sense in our case. --- JGE/src/linux/JGfx.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/JGE/src/linux/JGfx.cpp b/JGE/src/linux/JGfx.cpp index 8fa429f58..e7e5225f0 100644 --- a/JGE/src/linux/JGfx.cpp +++ b/JGE/src/linux/JGfx.cpp @@ -590,7 +590,7 @@ static void jpeg_mem_src(j_decompress_ptr cinfo, byte *mem, int len) LoadJPG ============== */ -void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode __attribute__((unused))) +void JRenderer::LoadJPG(TextureInfo &textureInfo, const char *filename, int mode __attribute__((unused)), int TextureFormat __attribute__((unused))) { @@ -738,7 +738,7 @@ static void PNGCustomReadDataFn(png_structp png_ptr, png_bytep data, png_size_t } -JTexture* JRenderer::LoadTexture(const char* filename, int mode) +JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureFormat __attribute__((unused))) { TextureInfo textureInfo; @@ -827,7 +827,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode) return tex; } -void JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode __attribute__((unused))) +void JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode __attribute__((unused)), int TextureFormat __attribute__((unused))) { //TextureInfo* textureInfo = new TextureInfo; @@ -1022,7 +1022,7 @@ void JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode ////////////////////////////////////////////////////////////////////////// /// GIF Support -int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bgcolor, InputFunc readFunc,int mode __attribute__((unused))) +int JRenderer::image_readgif(void * handle, TextureInfo &textureInfo, DWORD * bgcolor, InputFunc readFunc, int mode __attribute__((unused)), int TextureFormat __attribute__((unused))) { // pixel ** image_data=NULL; @@ -1163,7 +1163,7 @@ int image_gif_read(GifFileType * ft, GifByteType * buf, int size) } -void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode) +void JRenderer::LoadGIF(TextureInfo &textureInfo, const char *filename, int mode, int TextureFormat __attribute__((unused))) { ///* //FILE * fp = fopen(filename, "rb");