diff options
| author |   George L. Albany <Megacake1234@gmail.com> | 2023-12-24 23:00:36 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-24 23:00:36 +0100 |
| commit | bf4e7368600bb425b6612231fbb84de34ec99a27 (patch) | |
| tree | d3b29714d3286b9edbe380f877bbce541344a635 /src/openvic-simulation/utility/BMP.cpp | |
| parent | f036506b88af02508242f279ca29b743ef713976 (diff) | |
| parent | 3770de7a03879a8ff6b8cf22b402217c19fa2b53 (diff) | |
Merge pull request #100 from OpenVicProject/change/colour_t_to_struct
Diffstat (limited to 'src/openvic-simulation/utility/BMP.cpp')
| -rw-r--r-- | src/openvic-simulation/utility/BMP.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/utility/BMP.cpp b/src/openvic-simulation/utility/BMP.cpp index d4e7cf7..83d26c4 100644 --- a/src/openvic-simulation/utility/BMP.cpp +++ b/src/openvic-simulation/utility/BMP.cpp @@ -102,7 +102,7 @@ bool BMP::read_header() { if (header.num_colours != 0 && header.bits_per_pixel > PALETTE_BITS_PER_PIXEL_LIMIT) { Logger::error( "Invalid BMP palette size: ", header.num_colours, " (should be 0 as bits per pixel is ", header.bits_per_pixel, - " > 8)" + " > ", PALETTE_BITS_PER_PIXEL_LIMIT, ")" ); header_validated = false; } @@ -207,7 +207,7 @@ bool BMP::read_pixel_data() { Logger::error("Failed to move to the pixel data in the BMP file!"); return false; } - const size_t pixel_data_size = get_width() * get_height() * header.bits_per_pixel / 8; + const size_t pixel_data_size = get_width() * get_height() * header.bits_per_pixel / CHAR_BIT; pixel_data.resize(pixel_data_size); file.read(reinterpret_cast<char*>(pixel_data.data()), pixel_data_size); if (file.fail()) { |