Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

disable stb_image image loading

Browse Source 
its still around since we use it for image writing, which is fine for now.
This commit is contained in:
Green Sky 2024-04-17 15:57:36 +02:00
parent 854d09f05c
commit e66f4651d0
No known key found for this signature in database
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/media_meta_info_loader.cpp
View File

@ -3,7 +3,6 @@
#include "./image_loader_webp.hpp" #include "./image_loader_webp.hpp"
#include "./image_loader_sdl_bmp.hpp" #include "./image_loader_sdl_bmp.hpp"
#include "./image_loader_qoi.hpp" #include "./image_loader_qoi.hpp"
#include "./image_loader_stb.hpp"
#include "./image_loader_sdl_image.hpp" #include "./image_loader_sdl_image.hpp"
#include <solanaceae/message3/components.hpp> #include <solanaceae/message3/components.hpp>
@ -81,7 +80,6 @@ MediaMetaInfoLoader::MediaMetaInfoLoader(RegistryMessageModel& rmm) : _rmm(rmm)
_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>()); _image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());
_image_loaders.push_back(std::make_unique<ImageLoaderQOI>()); _image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>()); _image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
_image_loaders.push_back(std::make_unique<ImageLoaderSTB>());
_rmm.subscribe(this, RegistryMessageModel_Event::message_construct); _rmm.subscribe(this, RegistryMessageModel_Event::message_construct);
_rmm.subscribe(this, RegistryMessageModel_Event::message_updated); _rmm.subscribe(this, RegistryMessageModel_Event::message_updated);

2
src/message_image_loader.cpp
View File

@ -2,7 +2,6 @@
#include "./image_loader_sdl_bmp.hpp" #include "./image_loader_sdl_bmp.hpp"
#include "./image_loader_qoi.hpp" #include "./image_loader_qoi.hpp"
#include "./image_loader_stb.hpp"
#include "./image_loader_webp.hpp" #include "./image_loader_webp.hpp"
#include "./image_loader_sdl_image.hpp" #include "./image_loader_sdl_image.hpp"
#include "./media_meta_info_loader.hpp" #include "./media_meta_info_loader.hpp"
@ -24,7 +23,6 @@ MessageImageLoader::MessageImageLoader(void) {
_image_loaders.push_back(std::make_unique<ImageLoaderQOI>()); _image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
_image_loaders.push_back(std::make_unique<ImageLoaderWebP>()); _image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>()); _image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
_image_loaders.push_back(std::make_unique<ImageLoaderSTB>());
} }
std::optional<TextureEntry> MessageImageLoader::load(TextureUploaderI& tu, Message3Handle m) { std::optional<TextureEntry> MessageImageLoader::load(TextureUploaderI& tu, Message3Handle m) {

3
src/send_image_popup.cpp
View File

@ -4,6 +4,7 @@
#include "./image_loader_stb.hpp" #include "./image_loader_stb.hpp"
#include "./image_loader_webp.hpp" #include "./image_loader_webp.hpp"
#include "./image_loader_qoi.hpp" #include "./image_loader_qoi.hpp"
#include "./image_loader_sdl_image.hpp"
#include <imgui/imgui.h> #include <imgui/imgui.h>
@ -16,7 +17,7 @@ SendImagePopup::SendImagePopup(TextureUploaderI& tu) : _tu(tu) {
_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>()); _image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());
_image_loaders.push_back(std::make_unique<ImageLoaderQOI>()); _image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
_image_loaders.push_back(std::make_unique<ImageLoaderWebP>()); _image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
_image_loaders.push_back(std::make_unique<ImageLoaderSTB>()); _image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
} }
void SendImagePopup::reset(void) { void SendImagePopup::reset(void) {

2
src/tox_avatar_loader.cpp
View File

@ -2,7 +2,6 @@
#include "./image_loader_sdl_bmp.hpp" #include "./image_loader_sdl_bmp.hpp"
#include "./image_loader_qoi.hpp" #include "./image_loader_qoi.hpp"
#include "./image_loader_stb.hpp"
#include "./image_loader_webp.hpp" #include "./image_loader_webp.hpp"
#include "./image_loader_sdl_image.hpp" #include "./image_loader_sdl_image.hpp"
@ -26,7 +25,6 @@ ToxAvatarLoader::ToxAvatarLoader(Contact3Registry& cr) : _cr(cr) {
_image_loaders.push_back(std::make_unique<ImageLoaderQOI>()); _image_loaders.push_back(std::make_unique<ImageLoaderQOI>());
_image_loaders.push_back(std::make_unique<ImageLoaderWebP>()); _image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
_image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>()); _image_loaders.push_back(std::make_unique<ImageLoaderSDLImage>());
_image_loaders.push_back(std::make_unique<ImageLoaderSTB>());
} }
static float getHue_6bytes(const uint8_t* data) { static float getHue_6bytes(const uint8_t* data) {