RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

overlay_controls.cpp: Improve image_info ctor withstandability

Browse Source
This commit is contained in:
Eladash 2022-01-26 08:54:05 +02:00 committed by Ivan
parent 3a1676e558
commit 73ff506b88
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
View File

@ -27,15 +27,15 @@ namespace rsx
{
image_info::image_info(const char* filename)
{
if (!fs::is_file(filename))
fs::file f(filename);
if (!f)
{
rsx_log.error("Image resource file `%s' not found", filename);
rsx_log.error("Image resource file `%s' could not be opened (%s)", filename, fs::g_tls_error);
return;
}
std::vector<u8> bytes;
fs::file f(filename);
f.read(bytes, f.size());
auto bytes = f.to_vector<u8>();
data = stbi_load_from_memory(bytes.data(), ::narrow<int>(f.size()), &w, &h, &bpp, STBI_rgb_alpha);
}
@ -46,9 +46,7 @@ namespace rsx
image_info::~image_info()
{
stbi_image_free(data);
data = nullptr;
w = h = bpp = 0;
if (data) stbi_image_free(data);
}
resource_config::resource_config()