Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies/tinylogger
5 changes: 4 additions & 1 deletion src/Image.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <map>
#include <numeric>
#include <ranges>
#include <set>
#include <unordered_set>
#include <vector>

Expand Down Expand Up @@ -547,7 +548,9 @@ Task<void> ImageData::ensureValid(string_view channelSelector, int taskPriority)
unordered_map<string_view, size_t> channelNameCounter;
for (auto& c : channels) {
if (c.size() != size()) {
throw ImageLoadError{fmt::format("All channels must have the same size as the data window. ({}: {} != {})", c.name(), c.size(), size())};
throw ImageLoadError{
fmt::format("All channels must have the same size as the data window. ({}: {} != {})", c.name(), c.size(), size())
};
}

// Ensure the top-level layer of each channel is the image's part name
Expand Down
3 changes: 2 additions & 1 deletion src/imageio/TiffImageLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <optional>
#include <span>
#include <type_traits>
#include <unordered_set>
#include <vector>

using namespace nanogui;
Expand Down Expand Up @@ -2441,7 +2442,7 @@ Task<ImageData> readTiffImage(
);
}

const set<uint16_t> labPhotometrics = {
const unordered_set<uint16_t> labPhotometrics = {
PHOTOMETRIC_CIELAB,
PHOTOMETRIC_ICCLAB,
PHOTOMETRIC_ITULAB,
Expand Down
Loading