diff options
| author |   Spartan322 <Megacake1234@gmail.com> | 2023-12-25 08:42:11 +0100 |
|---|---|---|
| committer | Spartan322 <Megacake1234@gmail.com> | 2023-12-31 20:46:26 +0100 |
| commit | e1496a87178d925277aceed0ebcbab06920e15ee (patch) | |
| tree | ba081f9f4d74865ab5851a2efd560745900ca81a /src/openvic-simulation/utility/BMP.cpp | |
| parent | 0a425fbe05d6138b753c0e4a7c06f06695bde8af (diff) | |
Add `https://github.com/Tessil/ordered-map`
Add is_specialization_of to Utility.hpp
Add OpenVic::ordered_map and OpenVic::ordered_set
Change `std::map` to `ordered_map`
Change `std::set to use `ordered_set`
Add `set_callback_pointer(tsl::ordered_set<T const*>& set)`
Add mutable_iterator to enable mutable value iterator for `tsl::ordered_map`
Add std::hash<OpenVic::Date> implementation
Enable deps/SCsub to expose dependency includes neccessary for inclusion
Diffstat (limited to 'src/openvic-simulation/utility/BMP.cpp')
| -rw-r--r-- | src/openvic-simulation/utility/BMP.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/openvic-simulation/utility/BMP.cpp b/src/openvic-simulation/utility/BMP.cpp index 4c220da..c615aea 100644 --- a/src/openvic-simulation/utility/BMP.cpp +++ b/src/openvic-simulation/utility/BMP.cpp @@ -3,6 +3,7 @@ #include <cstring> #include <set> +#include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/utility/Logger.hpp" using namespace OpenVic; @@ -91,7 +92,7 @@ bool BMP::read_header() { // Validate colours #define VALID_BITS_PER_PIXEL 1, 2, 4, 8, 16, 24, 32 #define STR(x) #x - static const std::set<uint16_t> BITS_PER_PIXEL { VALID_BITS_PER_PIXEL }; + static const ordered_set<uint16_t> BITS_PER_PIXEL { VALID_BITS_PER_PIXEL }; if (!BITS_PER_PIXEL.contains(header.bits_per_pixel)) { Logger::error("Invalid BMP bits per pixel: ", header.bits_per_pixel, " (must be one of " STR(VALID_BITS_PER_PIXEL) ")"); header_validated = false; |