aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/utility/BMP.cpp
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2023-12-25 13:14:37 +0100
committer GitHub <noreply@github.com>2023-12-25 13:14:37 +0100
commitdcef842d5e070854913f9e61e4a1f485870ae703 (patch)
tree5b701a37faee6faa670ae186a97c218e1ad3455c /src/openvic-simulation/utility/BMP.cpp
parentbf4e7368600bb425b6612231fbb84de34ec99a27 (diff)
parent72b92d5a9f472b714e098756bf9ce5957843d198 (diff)
Merge pull request #104 from OpenVicProject/fix/bmp
Add `BMP::palette_colour_t` as uint32_t
Diffstat (limited to 'src/openvic-simulation/utility/BMP.cpp')
-rw-r--r--src/openvic-simulation/utility/BMP.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/utility/BMP.cpp b/src/openvic-simulation/utility/BMP.cpp
index 83d26c4..4c220da 100644
--- a/src/openvic-simulation/utility/BMP.cpp
+++ b/src/openvic-simulation/utility/BMP.cpp
@@ -110,7 +110,7 @@ bool BMP::read_header() {
palette_size = header.bits_per_pixel > PALETTE_BITS_PER_PIXEL_LIMIT ? 0
// Use header.num_colours if it's greater than 0 and at most 1 << header.bits_per_pixel
- : (0 < header.num_colours && header.num_colours - 1 >> header.bits_per_pixel == 0
+ : (0 < header.num_colours && (header.num_colours - 1) >> header.bits_per_pixel == 0
? header.num_colours : 1 << header.bits_per_pixel);
const uint32_t expected_offset = palette_size * PALETTE_COLOUR_SIZE + sizeof(header);
@@ -182,7 +182,7 @@ uint16_t BMP::get_bits_per_pixel() const {
return header.bits_per_pixel;
}
-std::vector<colour_t> const& BMP::get_palette() const {
+std::vector<BMP::palette_colour_t> const& BMP::get_palette() const {
if (!palette_read) {
Logger::warning("Trying to get BMP palette before loading");
}