fix: honor reference image resize opt-out in server requests (#2011)

This commit is contained in:
Aziz Muminov 2026-09-21 08:39:24 -07:00 committed by GitHub
parent 2726dd35c2
commit 78557f88d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions

View File

@ -2223,7 +2223,12 @@ bool SDGenerationParams::from_json_str(
LOG_ERROR("invalid end_image"); LOG_ERROR("invalid end_image");
return false; return false;
} }
if (!parse_image_array_json_field(j, "ref_images", 3, width, height, ref_images)) { if (!parse_image_array_json_field(j,
"ref_images",
3,
auto_resize_ref_image ? width : 0,
auto_resize_ref_image ? height : 0,
ref_images)) {
LOG_ERROR("invalid ref_images"); LOG_ERROR("invalid ref_images");
return false; return false;
} }

View File

@ -244,8 +244,12 @@ static bool build_sdapi_img_gen_request(const json& j,
SDImageOwner image_owner; SDImageOwner image_owner;
if (decode_base64_image(extra_image.get<std::string>(), if (decode_base64_image(extra_image.get<std::string>(),
3, 3,
request.gen_params.width_and_height_are_set() ? request.gen_params.width : 0, request.gen_params.auto_resize_ref_image && request.gen_params.width_and_height_are_set()
request.gen_params.width_and_height_are_set() ? request.gen_params.height : 0, ? request.gen_params.width
: 0,
request.gen_params.auto_resize_ref_image && request.gen_params.width_and_height_are_set()
? request.gen_params.height
: 0,
image_owner)) { image_owner)) {
const sd_image_t& image = image_owner.get(); const sd_image_t& image = image_owner.get();
request.gen_params.set_width_and_height_if_unset(image.width, image.height); request.gen_params.set_width_and_height_if_unset(image.width, image.height);