Atomic woes, megalinter, and batches (#13)
* fix libCZI dependency w/ atomic woes * add megalinter * fix megalinter triggers * use correct flavor * build status in readme * clang-format * megalinter batch * disable suggestions set libCZI options before fetching Set compile definitions for static libCZI
This commit is contained in:
committed by
Maximilian Kueffner
parent
b1923a490c
commit
d6a08f7db3
@@ -22,6 +22,8 @@ set(IMAGELIBLIBNAME pixelariumimagelib)
|
||||
add_library(${IMAGELIBLIBNAME}
|
||||
STATIC ${IMAGELIBSRC})
|
||||
|
||||
target_compile_definitions(${IMAGELIBLIBNAME} PUBLIC _LIBCZISTATICLIB)
|
||||
|
||||
target_link_libraries(${IMAGELIBLIBNAME}
|
||||
PUBLIC ${OpenCV_LIBS}
|
||||
PUBLIC pixelariumutilslib
|
||||
|
||||
@@ -46,7 +46,7 @@ class IPixelariumImage
|
||||
virtual std::unique_ptr<cv::Mat> TryGetImage() = 0;
|
||||
|
||||
/// @brief Attempts to retrieve the image.
|
||||
/// @param query The query object defining the images to retrieve.///
|
||||
/// @param query The query object defining the images to retrieve.
|
||||
/// @return A unique pointer to a Mat object containing the image data,
|
||||
/// or nullptr if the image is not found or cannot be retrieved.
|
||||
virtual std::unique_ptr<cv::Mat> TryGetImage(const IImageQuery& query) = 0;
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
#include "impl/PixelariumJpg.hpp"
|
||||
#include "impl/PixelariumPng.hpp"
|
||||
|
||||
|
||||
/*static*/ std::unique_ptr<pixelarium::imaging::IPixelariumImage>
|
||||
pixelarium::imaging::PixelariumImageFactory::CreateImage(const std::string& uri, const Log& log)
|
||||
{
|
||||
|
||||
@@ -29,7 +29,6 @@ bool comp_blockinfo_params(const pixelarium::imaging::CziParams& params, const l
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
constexpr int try_get_index_match(const pixelarium::imaging::CziParams& params, libCZI::ICZIReader& reader)
|
||||
{
|
||||
int index{-1};
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#include <string>
|
||||
|
||||
#include "../IPixelariumImage.hpp"
|
||||
#include "utilities/ILog.hpp"
|
||||
#include "libCZI.h"
|
||||
#include "utilities/ILog.hpp"
|
||||
|
||||
namespace pixelarium::imaging
|
||||
{
|
||||
@@ -21,12 +21,12 @@ struct CziParams : public IImageQuery
|
||||
class PixelariumCzi : public IPixelariumImage
|
||||
{
|
||||
using Log = pixelarium::utils::log::ILog;
|
||||
|
||||
public:
|
||||
explicit PixelariumCzi(const std::string& uri, const Log& log);
|
||||
~PixelariumCzi()
|
||||
{
|
||||
if (this->czi_reader_)
|
||||
this->czi_reader_->Close();
|
||||
if (this->czi_reader_) this->czi_reader_->Close();
|
||||
}
|
||||
|
||||
// IPixelariumImage member implementations
|
||||
|
||||
Reference in New Issue
Block a user