some fixes for readerwriter

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15)
 cmake_policy(SET CMP0091 NEW) # enable new "MSVC runtime library selection" (https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html)
 
 project(libCZI 
-      VERSION 0.58.0
+      VERSION 0.58.1
       HOMEPAGE_URL "https://github.com/ZEISS/libczi"
       DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI")
 

Src/libCZI/CziReaderWriter.cpp

@@ -130,8 +130,8 @@
     wi.writeFunc = std::bind(&CCziReaderWriter::WriteToOutputStream, this, placeholders::_1, placeholders::_2, placeholders::_3, placeholders::_4, placeholders::_5);
     wi.useSpecifiedAllocatedSize = false;
 
-    auto sizeOfSbBlk = CWriterUtils::WriteSubBlock(wi, addSbBlkInfo);
-    this->nextSegmentInfo.SetNextSegmentPos(wi.segmentPos + sizeOfSbBlk /*+ sizeof(SegmentHeader)*/);
+    const auto sizeOfSbBlk = CWriterUtils::WriteSubBlock(wi, addSbBlkInfo);
+    this->nextSegmentInfo.SetNextSegmentPos(wi.segmentPos + sizeOfSbBlk);
 }
 
 /*virtual*/void CCziReaderWriter::SyncAddAttachment(const libCZI::AddAttachmentInfo& addAttachmentInfo)
@@ -415,13 +415,14 @@
                 },
                 &attchmntDirSegmentSize);
 
+            this->attachmentDirectory.SetModified(false);
             this->attachmentDirectorySegment.SetPositionAndAllocatedSize(pos, attchmntDirSegmentSize.AllocatedSize, false);
         }
 
         pos = this->hdrSegmentData.GetMetadataPosition();
         if (pos != 0)
         {
-            auto segmentSize = CCZIParse::ReadSegmentHeader(CCZIParse::SegmentType::Metadata, this->stream.get(), this->hdrSegmentData.GetMetadataPosition());
+            const auto segmentSize = CCZIParse::ReadSegmentHeader(CCZIParse::SegmentType::Metadata, this->stream.get(), this->hdrSegmentData.GetMetadataPosition());
             this->metadataSegment.SetPositionAndAllocatedSize(pos, segmentSize.AllocatedSize, false);
         }
     }
@@ -641,12 +642,14 @@
         [&](int index, const CCziSubBlockDirectory::SubBlkEntry& entry)->bool
         {
             SubBlockInfo info;
-    info.coordinate = entry.coordinate;
-    info.logicalRect = IntRect{ entry.x,entry.y,entry.width,entry.height };
-    info.physicalSize = IntSize{ (std::uint32_t)entry.storedWidth, (std::uint32_t)entry.storedHeight };
-    info.mIndex = entry.mIndex;
-    info.pixelType = CziUtils::PixelTypeFromInt(entry.PixelType);
-    return funcEnum(index, info);
+            info.compressionModeRaw = entry.Compression;
+            info.pixelType = CziUtils::PixelTypeFromInt(entry.PixelType);
+            info.coordinate = entry.coordinate;
+            info.logicalRect = IntRect{ entry.x,entry.y,entry.width,entry.height };
+            info.physicalSize = IntSize{ (std::uint32_t)entry.storedWidth, (std::uint32_t)entry.storedHeight };
+            info.mIndex = entry.mIndex;
+            info.pyramidType = CziUtils::PyramidTypeFromByte(entry.pyramid_type_from_spare);
+            return funcEnum(index, info);
         });
 }
 

Src/libCZI/CziWriter.cpp

@@ -733,10 +733,11 @@ void libCZI::ICziWriter::SyncAddSubBlock(const AddSubBlockInfoStridedBitmap& add
 
     std::unique_ptr<AttachmentEntryA1, void(*)(AttachmentEntryA1*)> upAttchmntData((AttachmentEntryA1*)malloc(sizeAttchmntEntries), [](AttachmentEntryA1* p)->void {free(p); });
 
+    size_t index_count = 0;
     info.enumEntriesFunc(
         [&](size_t index, const CCziAttachmentsDirectoryBase::AttachmentEntry& entry)->bool
         {
-            AttachmentEntryA1* p = (upAttchmntData.get() + index);
+            AttachmentEntryA1* p = upAttchmntData.get() + index_count;
             p->SchemaType[0] = 'A';
             p->SchemaType[1] = '1';
             memset(&p->_spare[0], 0, sizeof(p->_spare));
@@ -747,6 +748,7 @@ void libCZI::ICziWriter::SyncAddSubBlock(const AddSubBlockInfoStridedBitmap& add
             memcpy(&p->Name[0], &entry.Name[0], sizeof(p->Name));
 
             ConvertToHostByteOrder::Convert(p);
+            ++index_count;
             return true;
         });
 

Src/libCZI/Doc/version-history.markdown

@@ -17,3 +17,4 @@ version history                 {#version_history}
  0.57.2             | [90](https://github.com/ZEISS/libczi/pull/90)        | improve thread-safety of CziReader
  0.57.3             | [91](https://github.com/ZEISS/libczi/pull/91)        | improve error-message
  0.58.0             | [92](https://github.com/ZEISS/libczi/pull/92)        | export a list with properties for streams-property-bag
+ 0.58.1             | [95](https://github.com/ZEISS/libczi/pull/95)        | some fixes for CziReaderWriter