max/pixelarium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Transition to C++23 (#11)

Browse Source 
* enum field renaming

* renderer cleanups

* compiling for C++23

* version bump

* fix build
This commit is contained in:
m-aXimilian
2025-10-07 12:18:00 +02:00
committed by Maximilian Kueffner
parent 1ea83d9d11
commit fec5c08aaa
15 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/imaging/IPixelariumImage.hpp
+6 -6
View File
@@ -14,15 +14,15 @@ using ImageQueryFunctor = std::function<void(const std::string&, void*, int*)>;
enum class ImageFileType
{
/// @brief Represents an unknown or unsupported file type.
UNKNOWN = -10,
kUnknown = -10,
/// @brief Represents an abstract image type (e.g., a placeholder).
ABSTRACT = 0,
kAbstract = 0,
/// @brief Represents a PNG image file.
PNG = 1,
kPng = 1,
/// @brief Represents a JPG image file.
JPG = 2,
kJpg = 2,
/// @brief Represents a CZI image file.
CZI = 3,
kCzi = 3,
};
/// @brief An abstract interface to define a semantic query
@@ -83,7 +83,7 @@ class IPixelariumImage
}
public:
const static ImageFileType type_{ImageFileType::ABSTRACT};
const static ImageFileType type_{ImageFileType::kAbstract};
protected:
std::filesystem::path uri_;
lib/imaging/PixelariumImageFactory.cpp
+5 -5
View File
@@ -16,19 +16,19 @@ pixelarium::imaging::PixelariumImageFactory::CreateImage(const std::string& uri,
switch (target_type)
{
case ImageFileType::UNKNOWN:
case ImageFileType::kUnknown:
return {};
break;
case ImageFileType::ABSTRACT:
case ImageFileType::kAbstract:
return {};
break;
case ImageFileType::PNG:
case ImageFileType::kPng:
return std::make_unique<PixelariumPng>(uri);
break;
case ImageFileType::JPG:
case ImageFileType::kJpg:
return std::make_unique<PixelariumJpg>(uri);
break;
case ImageFileType::CZI:
case ImageFileType::kCzi:
return std::make_unique<PixelariumCzi>(uri, log);
break;
}
lib/imaging/PixelariumImageFactory.hpp
+4 -4
View File
@@ -13,18 +13,18 @@ constexpr pixelarium::imaging::ImageFileType ExtensionToType(const std::string&
if (lower_ext == ".jpg" || lower_ext == ".jpeg")
{
return pixelarium::imaging::ImageFileType::JPG;
return pixelarium::imaging::ImageFileType::kJpg;
}
if (lower_ext == ".png")
{
return pixelarium::imaging::ImageFileType::PNG;
return pixelarium::imaging::ImageFileType::kPng;
}
if (lower_ext == ".czi")
{
return pixelarium::imaging::ImageFileType::CZI;
return pixelarium::imaging::ImageFileType::kCzi;
}
return pixelarium::imaging::ImageFileType::UNKNOWN;
return pixelarium::imaging::ImageFileType::kUnknown;
}
/// @brief Factory for instantiating implementations of IPixelariumImage based on the given file type.
lib/imaging/impl/PixelariumCzi.hpp
+1 -1
View File
@@ -46,7 +46,7 @@ class PixelariumCzi : public IPixelariumImage
const libCZI::SubBlockStatistics& GetStatistics() const { return this->image_statistics_; }
public:
const static ImageFileType type_{ImageFileType::CZI};
const static ImageFileType type_{ImageFileType::kCzi};
private:
std::unique_ptr<cv::Mat> SubblockToCvMat(int index);
lib/imaging/impl/PixelariumJpg.hpp
+1 -1
View File
@@ -32,7 +32,7 @@ class PixelariumJpg : public IPixelariumImage
bool Empty() const noexcept override { return this->is_empty_; }
public:
const static ImageFileType type_{ImageFileType::JPG};
const static ImageFileType type_{ImageFileType::kJpg};
private:
// this should be set by each image getter
lib/imaging/impl/PixelariumPng.hpp
+1 -1
View File
@@ -32,7 +32,7 @@ class PixelariumPng : public IPixelariumImage
bool Empty() const noexcept override { return this->is_empty_; }
public:
const static ImageFileType type_{ImageFileType::PNG};
const static ImageFileType type_{ImageFileType::kPng};
private:
// this should be set by each image getter
lib/rendering/CvMatRender.cpp
+13 -9
View File
@@ -55,21 +55,25 @@ GLuint pixelarium::render::CvMatRender::uploadTexture()
const int width = img_.cols;
const int height = img_.rows;
switch (img_.type()) {
// see
// https://stackoverflow.com/questions/10167534/how-to-find-out-what-type-of-a-mat-object-is-with-mattype-in-opencv
// for pixel a pixel type table
switch (img_.type())
{
case CV_8U:
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_BYTE, img_.data);
break;
case CV_16U:
case CV_16UC3:
case 26:
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
case CV_16UC4:
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_SHORT, img_.data);
break;
case 5:
case 29:
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_FLOAT, img_.data);
case CV_32F:
case CV_32FC4:
glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, width, height, 0, GL_DEPTH_COMPONENT, GL_FLOAT,
img_.data);
break;
default:
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, img_.cols, img_.rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, img_.data);
break;
}
lib/rendering/ImageViewFactory.cpp
+5 -5
View File
@@ -33,15 +33,15 @@ std::unique_ptr<pixelarium::render::IPixelariumImageView> pixelarium::render::Im
switch (type)
{
case imaging::ImageFileType::UNKNOWN:
case imaging::ImageFileType::ABSTRACT:
case imaging::ImageFileType::kUnknown:
case imaging::ImageFileType::kAbstract:
return {};
case imaging::ImageFileType::PNG:
case imaging::ImageFileType::JPG:
case imaging::ImageFileType::kPng:
case imaging::ImageFileType::kJpg:
log_.Info(std::format("{}: Creating a Default View", __PRETTY_FUNCTION__));
// beware: here we copy the actual image resource over to the new image
return std::make_unique<PixelariumImageViewDefault>(img);
case imaging::ImageFileType::CZI:
case imaging::ImageFileType::kCzi:
log_.Info(std::format("{}: Creating a CZI View", __PRETTY_FUNCTION__));
// beware: here we copy the actual image resource over to the new image
return std::make_unique<PixelariumImageViewCzi>(img, log_);
lib/rendering/PixelariumImageViewCzi.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void pixelarium::render::PixelariumImageViewCzi::ShowImage()
this->is_dirty_ = false;
}
if (czi_img->Empty() || this->img_->type_ == imaging::ImageFileType::UNKNOWN || !cached_image_ ||
if (czi_img->Empty() || this->img_->type_ == imaging::ImageFileType::kUnknown || !cached_image_ ||
czi_img->Name().empty())
{
// do nothing
lib/rendering/PixelariumImageViewDefault.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ void pixelarium::render::PixelariumImageViewDefault::ShowImage()
this->is_dirty_ = false;
}
if (this->img_->Empty() || this->img_->type_ == imaging::ImageFileType::UNKNOWN || !cached_image_ ||
if (this->img_->Empty() || this->img_->type_ == imaging::ImageFileType::kUnknown || !cached_image_ ||
this->img_->Name().empty())
{
// do nothing
lib/utilities/ILog.hpp
+5 -5
View File
@@ -10,11 +10,11 @@ namespace pixelarium::utils::log
{
enum class LogLevel
{
Trace = 1 << 0,
Debug = 1 << 1,
Info = 1 << 2,
Warn = 1 << 3,
Error = 1 << 4,
kTrace = 1 << 0,
kDebug = 1 << 1,
kInfo = 1 << 2,
kWarn = 1 << 3,
kError = 1 << 4,
};
/// @brief Interface for logging implementations.
class ILog
lib/utilities/SpdLogger.cpp
+10 -10
View File
@@ -30,15 +30,15 @@ void SpdLogger::ChangeLevel(LogLevel lvl) const
{
switch (l)
{
case LogLevel::Trace:
case LogLevel::kTrace:
return "Trace";
case LogLevel::Debug:
case LogLevel::kDebug:
return "Debug";
case LogLevel::Info:
case LogLevel::kInfo:
return "Info";
case LogLevel::Warn:
case LogLevel::kWarn:
return "Warn";
case LogLevel::Error:
case LogLevel::kError:
return "Error";
default:
return "Not Found";
@@ -47,23 +47,23 @@ void SpdLogger::ChangeLevel(LogLevel lvl) const
switch (lvl)
{
case LogLevel::Trace:
case LogLevel::kTrace:
this->logger_->set_level(spdlog::level::trace);
spdlog::flush_on(spdlog::level::trace);
break;
case LogLevel::Info:
case LogLevel::kInfo:
this->logger_->set_level(spdlog::level::info);
spdlog::flush_on(spdlog::level::info);
break;
case LogLevel::Warn:
case LogLevel::kWarn:
this->logger_->set_level(spdlog::level::warn);
spdlog::flush_on(spdlog::level::warn);
break;
case LogLevel::Error:
case LogLevel::kError:
this->logger_->set_level(spdlog::level::err);
spdlog::flush_on(spdlog::level::err);
break;
case LogLevel::Debug:
case LogLevel::kDebug:
default:
this->logger_->set_level(spdlog::level::debug);
spdlog::flush_on(spdlog::level::debug);