tobid7/renderd7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Possible Issue

Browse Source
This commit is contained in:
tobid7 2024-06-26 09:24:15 +02:00
parent 0b981f9b4d
commit 570d7f17fb
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/renderd7/Image.hpp
View File

@ -45,6 +45,7 @@ class Image {
bool Loadet(); bool Loadet();
private: private:
bool ext = false;
C2D_Image img; C2D_Image img;
}; };
} // namespace RenderD7 } // namespace RenderD7

4
source/Image.cpp
View File

@ -109,6 +109,7 @@ namespace RenderD7 {
void Image::Load(const std::string &path) { void Image::Load(const std::string &path) {
// Make sure to cleanup // Make sure to cleanup
Delete(); Delete();
ext = false;
// Setup Func and Load Data // Setup Func and Load Data
int w, h, c = 0; int w, h, c = 0;
unsigned char *image = stbi_load(path.c_str(), &w, &h, &c, 4); unsigned char *image = stbi_load(path.c_str(), &w, &h, &c, 4);
@ -148,6 +149,7 @@ void Image::Load(const std::string &path) {
void Image::From_NIMG(const nimg &image) { void Image::From_NIMG(const nimg &image) {
// Make sure to cleanup // Make sure to cleanup
Delete(); Delete();
ext = false;
if (image.width > 1024 || image.height > 1024) return; if (image.width > 1024 || image.height > 1024) return;
C3D_Tex *tex = new C3D_Tex; C3D_Tex *tex = new C3D_Tex;
Tex3DS_SubTexture *subtex = new Tex3DS_SubTexture; Tex3DS_SubTexture *subtex = new Tex3DS_SubTexture;
@ -171,6 +173,7 @@ C2D_Image &Image::GetRef() {
void Image::Set(const C2D_Image &i) { void Image::Set(const C2D_Image &i) {
Delete(); Delete();
ext = true;
img = i; img = i;
} }
@ -180,6 +183,7 @@ R7Vec2 Image::GetSize() {
} }
void Image::Delete() { void Image::Delete() {
if(ext) return;
if (img.subtex != nullptr) { if (img.subtex != nullptr) {
delete img.subtex; delete img.subtex;
img.subtex = nullptr; img.subtex = nullptr;