TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass std::span to decode_data

Browse source
This commit is contained in:
Kp 2022-09-24 17:47:52 +00:00
parent 0b91da6d9c
commit 97f0c5a6d0
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/2d/bitmap.cpp
View file

@ -146,12 +146,12 @@ void gr_init_sub_bitmap (grs_bitmap &bm, grs_bitmap &bmParent, uint16_t x, uint1
bm.bm_data = &bmParent.bm_data[static_cast<uint32_t>((y*bmParent.bm_rowsize)+x)];
}
void decode_data(color_palette_index *const data, uint_fast32_t num_pixels, std::array<color_palette_index, 256> &colormap, std::bitset<256> &used)
void decode_data(const std::span<color_palette_index> data, const std::array<color_palette_index, 256> &colormap, std::bitset<256> &used)
{
const auto a = [&](uint8_t mapped) {
return used[mapped] = true, colormap[mapped];
};
std::transform(data, data + num_pixels, data, a);
std::transform(data.begin(), data.end(), data.begin(), a);
}
namespace {
@ -184,11 +184,11 @@ void gr_remap_bitmap_good(grs_bitmap &bmp, palette_array_t &palette, uint_fast32
std::bitset<256> freq{};
if (bmp.bm_w == bmp.bm_rowsize)
decode_data(bmp.get_bitmap_data(), bmp.bm_w * bmp.bm_h, colormap, freq );
decode_data(std::span(bmp.get_bitmap_data(), bmp.bm_w * bmp.bm_h), colormap, freq);
else {
auto p = bmp.get_bitmap_data();
for (uint_fast32_t y = bmp.bm_h; y--; p += bmp.bm_rowsize)
decode_data(p, bmp.bm_w, colormap, freq );
decode_data(std::span{p, bmp.bm_w}, colormap, freq);
}
if (transparent_color < freq.size() && freq[transparent_color])

6
common/2d/bitmap.h
View file

@ -8,14 +8,12 @@
#include "pstypes.h"
#ifdef __cplusplus
#include "palette.h"
#include <array>
#include <bitset>
#include <span>
namespace dcx {
void build_colormap_good(const palette_array_t &palette, std::array<color_palette_index, 256> &colormap);
void decode_data(color_palette_index *data, uint_fast32_t num_pixels, std::array<color_palette_index, 256> &colormap, std::bitset<256> &used);
void decode_data(std::span<color_palette_index> data, const std::array<color_palette_index, 256> &colormap, std::bitset<256> &used);
}
#endif

2
similar/2d/font.cpp
View file

@ -1024,7 +1024,7 @@ static std::unique_ptr<grs_font> gr_internal_init_font(const char *fontname)
colormap[TRANSPARENCY_COLOR] = TRANSPARENCY_COLOR; // changed from colormap[255] = 255 to this for macintosh
decode_data(ft_data, ptr - font->ft_data, colormap, freq );
decode_data(std::span{ft_data, ptr}, colormap, freq);
}
fontfile.reset();
//set curcanv vars