Green-Sky/tomato
Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

disable some more sdl image file types, and use typed loaders
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / windows (push) Has been cancelled
Details
ContinuousDelivery / windows-asan (push) Has been cancelled
Details
ContinuousDelivery / dumpsyms (push) Has been cancelled
Details
ContinuousDelivery / release (push) Has been cancelled
Details
ContinuousIntegration / linux (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / macos (push) Has been cancelled
Details
ContinuousIntegration / windows (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Green Sky 2025-04-08 20:36:29 +02:00
parent ea9c02539e
commit 72c4451ebe
No known key found for this signature in database
GPG Key ID: DBE05085D874AB4A
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/image_loader_sdl_image.cpp
View File

@ -6,6 +6,11 @@
#include <iostream>
static std::optional<const char*> getExt(SDL_IOStream* ios) {
// blacklist:
// - tga
// - tiff
// - xcf
if (IMG_isAVIF(ios)) {
return "avif";
} else if (IMG_isCUR(ios)) {
@ -30,10 +35,6 @@ static std::optional<const char*> getExt(SDL_IOStream* ios) {
return "pnm";
} else if (IMG_isSVG(ios)) {
return "svg";
} else if (IMG_isTIF(ios)) {
return "tiff";
} else if (IMG_isXCF(ios)) {
return "xcf";
} else if (IMG_isXPM(ios)) {
return "xpm";
} else if (IMG_isXV(ios)) {
@ -52,14 +53,13 @@ ImageLoaderSDLImage::ImageInfo ImageLoaderSDLImage::loadInfoFromMemory(const uin
auto* ios = SDL_IOFromConstMem(data, data_size);
// we ignore tga
auto ext_opt = getExt(ios);
if (!ext_opt.has_value()) {
SDL_CloseIO(ios);
return res;
}
SDL_Surface* surf = IMG_Load_IO(ios, true);
SDL_Surface* surf = IMG_LoadTyped_IO(ios, true, ext_opt.value());
if (surf == nullptr) {
return res;
}
@ -78,14 +78,13 @@ ImageLoaderSDLImage::ImageResult ImageLoaderSDLImage::loadFromMemoryRGBA(const u
auto* ios = SDL_IOFromConstMem(data, data_size);
// we ignore tga
auto ext_opt = getExt(ios);
if (!ext_opt.has_value()) {
SDL_CloseIO(ios);
return res;
}
IMG_Animation* anim = IMG_LoadAnimation_IO(ios, true);
IMG_Animation* anim = IMG_LoadAnimationTyped_IO(ios, true, ext_opt.value());
if (anim == nullptr) {
return res;
}