missing files from previous commit

ZEISS · Jun 27, 2024 · c31b13a · c31b13a
1 parent 2390e85
commit c31b13a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/documentation/version-history.md b/documentation/version-history.md
@@ -4,4 +4,5 @@ version history                 {#version_history}
  version            |  PR                                                  | comment
  ------------------ | ---------------------------------------------------- | ---------------------------------------------------
  0.3.0              |  N/A                                                 | initial release
- 0.3.1              |  [3](https://github.com/ZEISS/warpaffine/pull/3)     | bugfix for a crash for "CZIs containing a single brick but have an S-index"
+ 0.3.1              |  [3](https://github.com/ZEISS/warpaffine/pull/3)     | bugfix for a crash for "CZIs containing a single brick but have an S-index"
+ 0.4.0              |  [6](https://github.com/ZEISS/warpaffine/pull/6)     | set re-tiling id of sub-blocks to allow for more sensible stitching of resulting CZI
diff --git a/libwarpaffine/sliceswriter/SlicesWriterTbb.cpp b/libwarpaffine/sliceswriter/SlicesWriterTbb.cpp
@@ -106,9 +106,13 @@ void CziSlicesWriterTbb::WriteWorker()
                 const string metadata_xml = oss.str();
                 add_subblock_info.ptrSbBlkMetadata = metadata_xml.c_str();
                 add_subblock_info.sbBlkMetadataSize = metadata_xml.size();
-            }
 
-            this->writer_->SyncAddSubBlock(add_subblock_info);
+                this->writer_->SyncAddSubBlock(add_subblock_info);
+            }
+            else
+            {
+                this->writer_->SyncAddSubBlock(add_subblock_info);
+            }
 
             --this->number_of_slicewrite_operations_in_flight_;
         }
@@ -139,18 +143,18 @@ void CziSlicesWriterTbb::WriteWorker()
     }
 }
 
-libCZI::GUID CziSlicesWriterTbb::CreateRetilingIdWithZandSlice(int z, int slice)
-{
+libCZI::GUID CziSlicesWriterTbb::CreateRetilingIdWithZandSlice(int z, int slice) 
+const {
     libCZI::GUID guid = this-> retilingBaseId_;
-    guid.Data4[0] = static_cast<int8_t>(z >> 24);
-    guid.Data4[1] = static_cast<int8_t>(z >> 16);
-    guid.Data4[2] = static_cast<int8_t>(z >> 8);
-    guid.Data4[3] = static_cast<int8_t>(z);
-
-    guid.Data4[4] = static_cast<int8_t>(slice >> 24);
-    guid.Data4[5] = static_cast<int8_t>(slice >> 16);
-    guid.Data4[6] = static_cast<int8_t>(slice >> 8);
-    guid.Data4[7] = static_cast<int8_t>(slice);
+    guid.Data4[0] = static_cast<uint8_t>(z >> 24);
+    guid.Data4[1] = static_cast<uint8_t>(z >> 16);
+    guid.Data4[2] = static_cast<uint8_t>(z >> 8);
+    guid.Data4[3] = static_cast<uint8_t>(z);
+
+    guid.Data4[4] = static_cast<uint8_t>(slice >> 24);
+    guid.Data4[5] = static_cast<uint8_t>(slice >> 16);
+    guid.Data4[6] = static_cast<uint8_t>(slice >> 8);
+    guid.Data4[7] = static_cast<uint8_t>(slice);
 
     return guid;
 }

diff --git a/libwarpaffine/sliceswriter/SlicesWriterTbb.h b/libwarpaffine/sliceswriter/SlicesWriterTbb.h
@@ -49,5 +49,5 @@ class CziSlicesWriterTbb : public ICziSlicesWriter
 private:
     void WriteWorker();
     void CopyMetadata(libCZI::IXmlNodeRead* rootSource, libCZI::IXmlNodeRw* rootDestination);
-    libCZI::GUID CreateRetilingIdWithZandSlice(int z, int slice);
+    libCZI::GUID CreateRetilingIdWithZandSlice(int z, int slice) const;
 };