Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
-fix issue 410
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-05-07 12:46:00 +00:00
parent 7a593f2b2d
commit ded3736c6b
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
JGE/src/pc/JGfx.cpp
View File

@@ -815,13 +815,10 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode __attribute__((unused)), int TextureFormat __attribute__((unused))) int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode __attribute__((unused)), int TextureFormat __attribute__((unused)))
{ {
//TextureInfo* textureInfo = new TextureInfo;
//if (textureInfo == NULL) return NULL;
textureInfo.mBits = NULL; textureInfo.mBits = NULL;
// BOOL ret = FALSE;
DWORD* p32; DWORD* p32;
@@ -831,17 +828,13 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
png_uint_32 width, height, tw, th; png_uint_32 width, height, tw, th;
int bit_depth, color_type, interlace_type, x, y; int bit_depth, color_type, interlace_type, x, y;
DWORD* line; DWORD* line;
//FILE *fp;
//if ((fp = fopen(filename, "rb")) == NULL) return NULL;
JFileSystem* fileSystem = JFileSystem::GetInstance(); JFileSystem* fileSystem = JFileSystem::GetInstance();
if (!fileSystem->OpenFile(filename)) return JGE_ERR_CANT_OPEN_FILE; if (!fileSystem->OpenFile(filename)) return JGE_ERR_CANT_OPEN_FILE;
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (png_ptr == NULL) if (png_ptr == NULL)
{ {
//fclose(fp);
fileSystem->CloseFile(); fileSystem->CloseFile();
return JGE_ERR_PNG; return JGE_ERR_PNG;
@@ -919,8 +912,6 @@ int JRenderer::LoadPNG(TextureInfo &textureInfo, const char *filename, int mode
} }
}
free (line); free (line);
png_read_end(png_ptr, info_ptr); png_read_end(png_ptr, info_ptr);