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

Erwan

Browse Source 
- Stop calling the PNG Loading routine if not a .png file
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-09-21 03:58:19 +00:00
parent 2bb4377f80
commit ae93341a98
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JGE/src/JGfx.cpp
View File

@@ -1253,7 +1253,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int textureMode
LoadJPG(textureInfo, filename, mode, textureMode); LoadJPG(textureInfo, filename, mode, textureMode);
else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL) else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL)
LoadGIF(textureInfo,filename, mode, textureMode); LoadGIF(textureInfo,filename, mode, textureMode);
else else if(strstr(filename, ".png")!=NULL || strstr(filename, ".PNG")!=NULL)
LoadPNG(textureInfo, filename, mode, textureMode); LoadPNG(textureInfo, filename, mode, textureMode);
if (textureInfo.mBits == NULL) if (textureInfo.mBits == NULL)

2
JGE/src/linux/JGfx.cpp
View File

@@ -749,7 +749,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
LoadJPG(textureInfo, filename); LoadJPG(textureInfo, filename);
else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL) else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL)
LoadGIF(textureInfo,filename); LoadGIF(textureInfo,filename);
else else if(strstr(filename, ".png")!=NULL || strstr(filename, ".PNG")!=NULL)
LoadPNG(textureInfo, filename); LoadPNG(textureInfo, filename);
if (textureInfo.mBits == NULL) if (textureInfo.mBits == NULL)

2
JGE/src/win/JRenderer_Win.cpp
View File

@@ -791,7 +791,7 @@ JTexture* JRenderer::LoadTexture(const char* filename, int mode, int TextureForm
LoadJPG(textureInfo, filename); LoadJPG(textureInfo, filename);
else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL) else if(strstr(filename, ".gif")!=NULL || strstr(filename, ".GIF")!=NULL)
LoadGIF(textureInfo,filename); LoadGIF(textureInfo,filename);
else else if(strstr(filename, ".png")!=NULL || strstr(filename, ".PNG")!=NULL)
LoadPNG(textureInfo, filename); LoadPNG(textureInfo, filename);
if (textureInfo.mBits == NULL) if (textureInfo.mBits == NULL)