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

Reworked some fixes submitted to us by ittobaal. Several fclose calls he suggested had no bearing (if fopen fails, calling fclose on a null pointer is pointless), but the (missing) array deletions were definitely valid bugs. The fix for CreateTexture() was a little loose, so I cleaned it up somewhat.

Browse Source 
Issue: 566
This commit is contained in:
wrenczes
2010-12-27 20:00:33 +00:00
parent 814993ac1c
commit 39e6d4f2b5
4 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JGE/src/JDistortionMesh.cpp
View File

@@ -53,7 +53,7 @@ JDistortionMesh::~JDistortionMesh()
{
delete mQuad;
delete mVertices;
delete[] mVertices;
// JGERelease();
}

4
JGE/src/JGBKFont.cpp
View File

@@ -44,9 +44,9 @@ JGBKFont::JGBKFont()
JGBKFont::~JGBKFont()
{
SAFE_DELETE(mEngFont);
SAFE_DELETE_ARRAY(mEngFont);
SAFE_DELETE(mChnFont);
SAFE_DELETE_ARRAY(mChnFont);
SAFE_DELETE(mTexture);

6
JGE/src/JGfx.cpp
View File

@@ -800,7 +800,11 @@ void JRenderer::ScreenShot(const char* filename)
fp = fopen(filename, "wb");
if (!fp) return;
png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!png_ptr) return;
if (!png_ptr)
{
fclose(fp);
return;
}
info_ptr = png_create_info_struct(png_ptr);
if (!info_ptr) {
png_destroy_write_struct(&png_ptr, (png_infopp)NULL);

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

@@ -2198,41 +2198,47 @@ void JRenderer::TransferTextureToGLContext(JTexture& inTexture)
JTexture* JRenderer::CreateTexture(int width, int height, int mode __attribute__((unused)))
{
checkGlError();
int size = width * height * sizeof(PIXEL_TYPE); // RGBA
BYTE* buffer = new BYTE[size];
JTexture *tex = new JTexture();
if (buffer && tex)
{
tex->mFilter = TEX_FILTER_LINEAR;
tex->mWidth = width;
tex->mHeight = height;
tex->mTexWidth = width;
tex->mTexHeight = height;
GLuint texid;
glGenTextures(1, &texid);
tex->mTexId = texid;
memset(buffer, 0, size);
mCurrentTex = texid;
glBindTexture(GL_TEXTURE_2D, mCurrentTex);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
delete[] buffer;
checkGlError();
JTexture *tex = new JTexture();
if (tex)
{
int size = width * height * sizeof(PIXEL_TYPE); // RGBA
BYTE* buffer = new BYTE[size];
if (buffer)
{
tex->mFilter = TEX_FILTER_LINEAR;
tex->mWidth = width;
tex->mHeight = height;
tex->mTexWidth = width;
tex->mTexHeight = height;
GLuint texid;
glGenTextures(1, &texid);
tex->mTexId = texid;
memset(buffer, 0, size);
mCurrentTex = texid;
glBindTexture(GL_TEXTURE_2D, mCurrentTex);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, buffer);
delete[] buffer;
checkGlError();
}
else
{
delete tex;
tex = NULL;
}
}
return tex;
}
else
return NULL;
}