From 351f4626b3863738213525e9e9d67190a6f25d27 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 16 Oct 2025 12:26:30 +0200 Subject: [PATCH 1/2] roi max should be incremented by 1 for all versions of the file --- src/RawMasterFile.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/RawMasterFile.cpp b/src/RawMasterFile.cpp index 6d39f16..cd913fd 100644 --- a/src/RawMasterFile.cpp +++ b/src/RawMasterFile.cpp @@ -314,11 +314,8 @@ void RawMasterFile::parse_json(const std::filesystem::path &fpath) { // if any of the values are set update the roi if (tmp_roi.xmin != 4294967295 || tmp_roi.xmax != 4294967295 || tmp_roi.ymin != 4294967295 || tmp_roi.ymax != 4294967295) { - - if (v < 7.21) { - tmp_roi.xmax++; // why is it updated - tmp_roi.ymax++; - } + tmp_roi.xmax++; + tmp_roi.ymax++; m_roi = tmp_roi; } From 723c8dd0135bef9f9870ee429833bff42e31b290 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 16 Oct 2025 15:30:43 +0200 Subject: [PATCH 2/2] add nlohmann_json to support CMake find_package after 3.12 split --- etc/dev-env.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/dev-env.yml b/etc/dev-env.yml index 2edfc46..5b83b40 100644 --- a/etc/dev-env.yml +++ b/etc/dev-env.yml @@ -13,4 +13,5 @@ dependencies: - pybind11 - numpy - matplotlib + - nlohmann_json