godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Merge pull request #35155 from timothyqiu/optional-jpg

Browse Source 
Fixes AssetLib crash when JPG module is disabled
This commit is contained in:
Rémi Verschelde
2020-01-15 15:50:27 +01:00
committed by GitHub
parent 7c624949b5 43ad6e8c96
commit 2bc47d1680
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/asset_library_editor_plugin.cpp
View File

@@ -726,9 +726,9 @@ void EditorAssetLibrary::_image_update(bool use_cache, bool final, const PoolByt
uint8_t jpg_signature[3] = { 255, 216, 255 }; uint8_t jpg_signature[3] = { 255, 216, 255 };
if (r.ptr()) { if (r.ptr()) {
if (memcmp(&r[0], &png_signature[0], 8) == 0) { if ((memcmp(&r[0], &png_signature[0], 8) == 0) && Image::_png_mem_loader_func) {
image->copy_internals_from(Image::_png_mem_loader_func(r.ptr(), len)); image->copy_internals_from(Image::_png_mem_loader_func(r.ptr(), len));
} else if (memcmp(&r[0], &jpg_signature[0], 3) == 0) { } else if ((memcmp(&r[0], &jpg_signature[0], 3) == 0) && Image::_jpg_mem_loader_func) {
image->copy_internals_from(Image::_jpg_mem_loader_func(r.ptr(), len)); image->copy_internals_from(Image::_jpg_mem_loader_func(r.ptr(), len));
} }
} }