From d82349718c6ef4a38003ebc2438b13d813e2f183 Mon Sep 17 00:00:00 2001 From: Wagner Bruna Date: Sat, 25 Oct 2025 17:55:22 -0300 Subject: [PATCH] chore: clean up stb includes --- stable-diffusion.cpp | 14 +++----------- util.cpp | 3 --- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp index f9fe8a5a3..3e97bb515 100644 --- a/stable-diffusion.cpp +++ b/stable-diffusion.cpp @@ -16,14 +16,6 @@ #include "tae.hpp" #include "vae.hpp" -#define STB_IMAGE_IMPLEMENTATION -#define STB_IMAGE_STATIC -#include "stb_image.h" - -// #define STB_IMAGE_WRITE_IMPLEMENTATION -// #define STB_IMAGE_WRITE_STATIC -// #include "stb_image_write.h" - const char* model_version_to_str[] = { "SD 1.x", "SD 1.x Inpaint", @@ -1150,7 +1142,7 @@ class StableDiffusionGGML { std::vector skip_layers(guidance.slg.layers, guidance.slg.layers + guidance.slg.layer_count); float cfg_scale = guidance.txt_cfg; - float img_cfg_scale = isfinite(guidance.img_cfg) ? guidance.img_cfg : guidance.txt_cfg; + float img_cfg_scale = std::isfinite(guidance.img_cfg) ? guidance.img_cfg : guidance.txt_cfg; float slg_scale = guidance.slg.scale; if (img_cfg_scale != cfg_scale && !sd_version_is_inpaint_or_unet_edit(version)) { @@ -1987,7 +1979,7 @@ char* sd_sample_params_to_str(const sd_sample_params_t* sample_params) { "eta: %.2f, " "shifted_timestep: %d)", sample_params->guidance.txt_cfg, - isfinite(sample_params->guidance.img_cfg) + std::isfinite(sample_params->guidance.img_cfg) ? sample_params->guidance.img_cfg : sample_params->guidance.txt_cfg, sample_params->guidance.distilled_guidance, @@ -2153,7 +2145,7 @@ sd_image_t* generate_image_internal(sd_ctx_t* sd_ctx, seed = rand(); } - if (!isfinite(guidance.img_cfg)) { + if (!std::isfinite(guidance.img_cfg)) { guidance.img_cfg = guidance.txt_cfg; } diff --git a/util.cpp b/util.cpp index d6d067525..b205f522b 100644 --- a/util.cpp +++ b/util.cpp @@ -26,9 +26,6 @@ #include "ggml.h" #include "stable-diffusion.h" -#define STB_IMAGE_RESIZE_IMPLEMENTATION -#include "stb_image_resize.h" - bool ends_with(const std::string& str, const std::string& ending) { if (str.length() >= ending.length()) { return (str.compare(str.length() - ending.length(), ending.length(), ending) == 0);