Skip to content

Commit

Permalink
bytes-per-pel for pixeltype "Bgr192ComplexFloat" is 24 (not 48) (#62)
Browse files Browse the repository at this point in the history
* bytes-per-pel for pixeltype "Bgr192ComplexFloat" is 24 (not 48)

* bump version
  • Loading branch information
ptahmose authored Aug 28, 2023
1 parent 829a138 commit 621c519
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.50.0
VERSION 0.50.1
HOMEPAGE_URL "https://github.com/ZEISS/libczi"
DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI")

Expand Down
8 changes: 4 additions & 4 deletions Src/libCZI/CziUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ using namespace libCZI;
{
switch (i)
{
case 0: return CompressionMode::UnCompressed;
case 1: return CompressionMode::Jpg;
case 4: return CompressionMode::JpgXr;
case 0: return CompressionMode::UnCompressed;
case 1: return CompressionMode::Jpg;
case 4: return CompressionMode::JpgXr;
case 5: return CompressionMode::Zstd0;
case 6: return CompressionMode::Zstd1;
default: return CompressionMode::Invalid;
Expand Down Expand Up @@ -92,7 +92,7 @@ using namespace libCZI;
case PixelType::Bgr96Float: return 12;
case PixelType::Bgra32: return 4;
case PixelType::Gray64ComplexFloat: return 16;
case PixelType::Bgr192ComplexFloat: return 48;
case PixelType::Bgr192ComplexFloat: return 24;
case PixelType::Gray32: return 4;
case PixelType::Gray64Float: return 8;
default: throw std::invalid_argument("illegal pixeltype");
Expand Down
2 changes: 1 addition & 1 deletion Src/libCZI/CziUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ template <> constexpr std::uint8_t CziUtils::BytesPerPel<libCZI::PixelType::Bgra
template <> constexpr std::uint8_t CziUtils::BytesPerPel<libCZI::PixelType::Gray32>() { return 4; }
template <> constexpr std::uint8_t CziUtils::BytesPerPel<libCZI::PixelType::Bgr96Float>() { return 3 * 4; }
template <> constexpr std::uint8_t CziUtils::BytesPerPel<libCZI::PixelType::Gray64ComplexFloat>() { return 2 * 8; }
template <> constexpr std::uint8_t CziUtils::BytesPerPel<libCZI::PixelType::Bgr192ComplexFloat>() { return 48; }
template <> constexpr std::uint8_t CziUtils::BytesPerPel<libCZI::PixelType::Bgr192ComplexFloat>() { return 24; }

0 comments on commit 621c519

Please sign in to comment.