From cc968824e1c6ddf4afc9ceea8ea3912609060b35 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 2 Dec 2025 11:26:22 +0100 Subject: [PATCH 1/2] jfjoch_broker: Fix displaying resolution estimate --- broker/JFJochBrokerHttp.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp index 9f10ae74..2a4dd016 100644 --- a/broker/JFJochBrokerHttp.cpp +++ b/broker/JFJochBrokerHttp.cpp @@ -489,7 +489,12 @@ void JFJochBrokerHttp::image_buffer_image_jpeg_get(const std::optional settings.saturation_value = saturation; settings.background_value = 0.0; settings.jpeg_quality = jpegQuality.value_or(100); - settings.resolution_ring = showResRing; + if (showResEst.value_or(false)) + settings.show_res_est = true; + else { + settings.show_res_est = false; + settings.resolution_ring = showResRing; + } settings.scale = ConvertColorScale(color); settings.show_beam_center = showBeamCenter.value_or(true); settings.format = PreviewImageFormat::JPEG; -- 2.49.1 From f27c49b9d54c4e5a9633794973fd6d81cf76d97a Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Tue, 2 Dec 2025 11:28:36 +0100 Subject: [PATCH 2/2] CHANGELOG --- docs/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 254f0200..74cf1163 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog ## 1.0.0 +### 1.0.0-rc.114 +This is an UNSTABLE release and not recommended for production use (please use rc.111 instead). + +* jfjoch_broker: Fix generating JPEG images with resolution estimation + ### 1.0.0-rc.113 This is an UNSTABLE release and not recommended for production use (please use rc.111 instead). -- 2.49.1