jfjoch_process: Fix bounds for VDS mapping
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 15m21s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 17m39s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 17m35s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 18m9s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 18m3s
Build Packages / build:rpm (rocky8) (push) Successful in 18m20s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m3s
Build Packages / build:rpm (rocky9) (push) Successful in 10m20s
Build Packages / Generate python client (push) Successful in 32s
Build Packages / Build documentation (push) Successful in 1m6s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m58s
Build Packages / XDS test (durin plugin) (push) Successful in 11m14s
Build Packages / XDS test (neggia plugin) (push) Successful in 10m31s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 12m1s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m24s
Build Packages / DIALS test (push) Successful in 15m4s
Build Packages / Unit tests (push) Successful in 1h0m17s

This commit is contained in:
2026-05-09 20:43:39 +02:00
parent cf2ca90fb7
commit cc42ae6bf6
+3 -10
View File
@@ -395,7 +395,6 @@ int main(int argc, char **argv) {
std::atomic<int> processed_count = 0;
std::atomic<uint64_t> total_uncompressed_bytes = 0;
std::atomic<uint64_t> max_image_number_sent = 0;
start_message.file_format = FileWriterFormat::NXmxIntegrated;
start_message.write_master_file = true;
@@ -449,7 +448,8 @@ int main(int argc, char **argv) {
DataMessage msg{};
msg.image = img->image;
msg.number = image_idx;
msg.number = current_idx_offset;
msg.original_number = image_idx;
msg.image_collection_efficiency = dataset->efficiency[image_idx];
total_uncompressed_bytes += msg.image.GetUncompressedSize();
@@ -477,13 +477,6 @@ int main(int argc, char **argv) {
if (writer)
writer->Write(msg);
// Update max sent tracking
uint64_t current_max = max_image_number_sent.load();
while (static_cast<uint64_t>(msg.number) > current_max) {
if (max_image_number_sent.compare_exchange_weak(current_max, static_cast<uint64_t>(msg.number)))
break;
}
finished_count.fetch_add(1);
// Progress log
@@ -529,7 +522,7 @@ int main(int argc, char **argv) {
// 5. Finalize Statistics and Write EndMessage
EndMessage end_msg;
end_msg.max_image_number = max_image_number_sent;
end_msg.max_image_number = images_to_process;
end_msg.images_collected_count = images_to_process;
end_msg.images_sent_to_write_count = images_to_process;
end_msg.end_date = time_UTC(std::chrono::system_clock::now());