use ZEISS-libCZI

ptahmose · Mar 25, 2023 · 2d661b0 · 2d661b0
1 parent 633c7a3
commit 2d661b0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/modules/libCZI.cmake b/modules/libCZI.cmake
@@ -3,14 +3,8 @@ include(FetchContent)
 
 FetchContent_Declare(
   libCZI
-  GIT_REPOSITORY https://github.com/ptahmose/libCZI.git
-  GIT_TAG        origin/master  # use the latest in this branch
-  # this version is "known-to-work"
-  #GIT_TAG        9aa6b6e411de217a9f2aa91909107def843fe1ec
-  #CMAKE_ARGS "-DLIBCZI_BUILD_CZICMD=OFF -DLIBCZI_BUILD_DYNLIB=OFF"
-  # ^ or like this - sometimes it's better because FetchContent won't look
-  # into remote to see if branch head was updated or not - good for stable
-  # tags like 'vX.X' corresponding to releases
+  GIT_REPOSITORY https://github.com/ZEISS/libczi
+  GIT_TAG        origin/main  # use the latest in this branch
 )
 
 if(NOT libCZI_POPULATED)

diff --git a/modules/rapidJSON.cmake b/modules/rapidJSON.cmake
@@ -5,7 +5,7 @@ ExternalProject_Add(
     rapidjson
     PREFIX "vendor/rapidjson"
     GIT_REPOSITORY "https://github.com/Tencent/rapidjson.git"
-    GIT_TAG f54b0e47a08782a6131cc3d60f94d038fa6e0a51
+    GIT_TAG v1.1.0
     TIMEOUT 10
     CMAKE_ARGS
         -DRAPIDJSON_BUILD_TESTS=OFF

diff --git a/wllczi/src/CziUtilities.cpp b/wllczi/src/CziUtilities.cpp
@@ -15,18 +15,18 @@ bool ChannelDisplaySettingsValidity::Get(Property prop) const
     return this->flags.test(static_cast<size_t>(prop) - 1);
 }
 
-/*static*/std::vector<std::shared_ptr<libCZI::IBitmapData>> CziUtilities::GetBitmapsFromSpecifiedChannels(libCZI::ICZIReader* reader, const libCZI::CDimCoordinate& planeCoordinate, const libCZI::IntRect& roi, float zoom, std::function<bool(int index, int& channelNo)> getChannelNo, libCZI::IntSize* ptrPixelSize)
+/*static*/std::vector<std::shared_ptr<libCZI::IBitmapData>> CziUtilities::GetBitmapsFromSpecifiedChannels(libCZI::ICZIReader* reader, const libCZI::IDimCoordinate* planeCoordinate, const libCZI::IntRect& roi, float zoom, std::function<bool(int index, int& channelNo)> getChannelNo, libCZI::IntSize* ptrPixelSize)
 {
     std::vector<std::shared_ptr<IBitmapData>> chBitmaps;
-    libCZI::CDimCoordinate coordinate = planeCoordinate;
+    libCZI::CDimCoordinate coordinate{ planeCoordinate };
 
     const auto subBlockStatistics = reader->GetStatistics();
 
     libCZI::ISingleChannelScalingTileAccessor::Options sctaOptions;
     sctaOptions.Clear();
     sctaOptions.backGroundColor = RgbFloatColor{ 0,0,0 };
 
-    auto accessor = reader->CreateSingleChannelScalingTileAccessor();
+    const auto accessor = reader->CreateSingleChannelScalingTileAccessor();
 
     for (int i = 0;; ++i)
     {

diff --git a/wllczi/src/CziUtilities.h b/wllczi/src/CziUtilities.h
@@ -44,7 +44,7 @@ struct ChannelDisplaySettingsInfo
 class CziUtilities
 {
 public:
-    static std::vector<std::shared_ptr<libCZI::IBitmapData>> GetBitmapsFromSpecifiedChannels(libCZI::ICZIReader* reader, const libCZI::CDimCoordinate& planeCoordinate, const libCZI::IntRect& roi, float zoom, std::function<bool(int index, int& channelNo)> getChannelNo, libCZI::IntSize* ptrPixelSize);
+    static std::vector<std::shared_ptr<libCZI::IBitmapData>> GetBitmapsFromSpecifiedChannels(libCZI::ICZIReader* reader, const libCZI::IDimCoordinate* planeCoordinate, const libCZI::IntRect& roi, float zoom, std::function<bool(int index, int& channelNo)> getChannelNo, libCZI::IntSize* ptrPixelSize);
 
     static ChannelDisplaySettingsInfo ParseDisplaySettings(const char* sz);
 

diff --git a/wllczi/src/MImageHelper.cpp b/wllczi/src/MImageHelper.cpp
@@ -155,7 +155,7 @@ using namespace libCZI;
         uint8_t* ptrLine = ((uint8_t*)ptr) + y * (size_t)stride;
         for (decltype(w) x = 0; x < w; ++x)
         {
-            uint8_t t = ptrLine[0];
+            const uint8_t t = ptrLine[0];
             ptrLine[0] = ptrLine[2];
             ptrLine[2] = t;
             ptrLine += 3;
@@ -170,7 +170,7 @@ using namespace libCZI;
         uint16_t* ptrLine = ((uint16_t*)ptr) + y * (size_t)stride;
         for (decltype(w) x = 0; x < w; ++x)
         {
-            uint16_t t = ptrLine[0];
+            const uint16_t t = ptrLine[0];
             ptrLine[0] = ptrLine[2];
             ptrLine[2] = t;
             ptrLine += 3;