joel16/VITAlbum
1
0
Fork 0
mirror of https://github.com/joel16/VITAlbum.git synced 2024-11-23 11:39:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix memleak when loading textures using stbi_load_from_memory

Browse Source
This commit is contained in:
Joel16 2020-07-10 15:59:57 -04:00
parent e832f03666
commit 4e263cfbc9
3 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/textures.h
View File

@ -5,9 +5,9 @@
#include <string>
typedef struct {
GLuint id = 0;
int width = 0;
int height = 0;
GLuint id;
int width;
int height;
} Tex;
extern Tex folder_texture, file_texture, image_texture;

2
source/fs.cpp
View File

@ -162,7 +162,7 @@ namespace FS {
return ret;
*size = sceIoLseek(file, 0, SEEK_END);
*buffer = (unsigned char *)std::malloc(*size);
*buffer = new unsigned char[*size];
if (R_FAILED(ret = sceIoPread(file, *buffer, *size, SCE_SEEK_SET)))
return ret;

63
source/textures.cpp
View File

@ -128,9 +128,8 @@ namespace ICO {
namespace Textures {
bool LoadImage(unsigned char *data, int *width, int *height, Tex *texture, void (*free_func)(void *)) {
// Create a OpenGL texture identifier
GLuint image;
glGenTextures(1, &image);
glBindTexture(GL_TEXTURE_2D, image);
glGenTextures(1, &texture->id);
glBindTexture(GL_TEXTURE_2D, texture->id);
// Setup filtering parameters for display
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@ -142,23 +141,23 @@ namespace Textures {
if (*free_func)
free_func(data);
texture->id = image;
texture->width = *width;
texture->height = *height;
return true;
}
bool LoadImageFile(const std::string &path, Tex *texture) {
unsigned char *data = nullptr;
SceOff size = 0;
unsigned char *data = nullptr, *image = nullptr;
if (R_FAILED(FS::ReadFile(path, &data, &size)))
return false;
int width = 0, height = 0;
data = stbi_load_from_memory(data, size, &width, &height, nullptr, BYTES_PER_PIXEL);
return LoadImage(data, &width, &height, texture, drpcx_free);
return false;
image = stbi_load_from_memory(data, size, &width, &height, nullptr, BYTES_PER_PIXEL);
bool ret = LoadImage(image, &width, &height, texture, stbi_image_free);
delete[] data;
return ret;
}
bool LoadImageBMP(const std::string &path, Tex *texture) {
@ -181,7 +180,7 @@ namespace Textures {
code = bmp_analyse(&bmp, size, data);
if (code != BMP_OK) {
bmp_finalise(&bmp);
free(data);
delete[] data;
return false;
}
@ -189,22 +188,22 @@ namespace Textures {
if (code != BMP_OK) {
if ((code != BMP_INSUFFICIENT_DATA) && (code != BMP_DATA_ERROR)) {
bmp_finalise(&bmp);
free(data);
delete[] data;
return false;
}
/* skip if the decoded image would be ridiculously large */
if ((bmp.width * bmp.height) > 200000) {
bmp_finalise(&bmp);
free(data);
delete[] data;
return false;
}
}
LoadImage((unsigned char *)bmp.bitmap, (int *)&bmp.width, (int *)&bmp.height, texture, nullptr);
bool ret = LoadImage((unsigned char *)bmp.bitmap, (int *)&bmp.width, (int *)&bmp.height, texture, nullptr);
bmp_finalise(&bmp);
free(data);
return true;
delete[] data;
return ret;
}
bool LoadImageGIF(const std::string &path, Tex *texture, unsigned int *frames) {
@ -230,7 +229,7 @@ namespace Textures {
code = gif_initialise(&gif, size, data);
if (code != GIF_OK && code != GIF_WORKING) {
gif_finalise(&gif);
free(data);
delete[] data;
return false;
}
} while (code != GIF_OK);
@ -244,17 +243,17 @@ namespace Textures {
for (unsigned int i = 0; i < gif.frame_count; i++) {
code = gif_decode_frame(&gif, i);
if (code != GIF_OK) {
free(data);
delete[] data;
return false;
}
//LoadImage((unsigned char *)gif.frame_image, (int *)&gif.width, (int *)&gif.height, texture[i], nullptr);
//LoadImage((unsigned char *)gif.frame_image, (int *)&gif.width, (int *)&gif.height, texture[i]);
}
}
else {
code = gif_decode_frame(&gif, 0);
if (code != GIF_OK) {
free(data);
delete[] data;
return false;
}
@ -262,7 +261,7 @@ namespace Textures {
}
gif_finalise(&gif);
free(data);
delete[] data;
return true;
}
@ -289,7 +288,7 @@ namespace Textures {
code = ico_analyse(&ico, size, data);
if (code != BMP_OK) {
ico_finalise(&ico);
free(data);
delete[] data;
return false;
}
@ -300,22 +299,22 @@ namespace Textures {
if (code != BMP_OK) {
if ((code != BMP_INSUFFICIENT_DATA) && (code != BMP_DATA_ERROR)) {
ico_finalise(&ico);
free(data);
delete[] data;
return false;
}
/* skip if the decoded image would be ridiculously large */
if ((bmp->width * bmp->height) > 200000) {
ico_finalise(&ico);
free(data);
delete[] data;
return false;
}
}
LoadImage((unsigned char *)bmp->bitmap, (int *)&bmp->width, (int *)&bmp->height, texture, nullptr);
bool ret = LoadImage((unsigned char *)bmp->bitmap, (int *)&bmp->width, (int *)&bmp->height, texture, nullptr);
ico_finalise(&ico);
free(data);
return true;
delete[] data;
return ret;
}
bool LoadImagePCX(const std::string &path, Tex *texture) {
@ -327,8 +326,9 @@ namespace Textures {
int width = 0, height = 0;
data = drpcx_load_memory(data, size, DRPCX_FALSE, &width, &height, nullptr, BYTES_PER_PIXEL);
return LoadImage(data, &width, &height, texture, drpcx_free);
return false;
bool ret = LoadImage(data, &width, &height, texture, nullptr);
delete[] data;
return ret;
}
bool LoadImageTIFF(const std::string &path, Tex *texture) {
@ -342,7 +342,7 @@ namespace Textures {
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &height);
num_pixels = width * height;
raster = (uint32*) _TIFFmalloc(num_pixels * sizeof (uint32));
raster = (uint32 *)_TIFFmalloc(num_pixels * sizeof (uint32));
if (raster != nullptr) {
if (TIFFReadRGBAImage(tif, width, height, raster, 0))
LoadImage((unsigned char *)raster, (int *)&width, (int *)&height, texture, _TIFFfree);
@ -363,8 +363,9 @@ namespace Textures {
int width = 0, height = 0;
data = WebPDecodeRGBA(data, size, &width, &height);
return LoadImage(data, &width, &height, texture, free);
return false;
bool ret = LoadImage(data, &width, &height, texture, nullptr);
delete[] data;
return ret;
}
void Free(Tex *texture) {