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

Use std::bitset to track used colors

Browse source 
This reduces memory usage over using std::array<bool> for the same
number of bits.
This commit is contained in:
Kp 2020-07-16 02:31:04 +00:00
parent 6af56a27f2
commit 8cc7be4986
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/2d/bitmap.cpp
View file

@ -137,7 +137,7 @@ 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)]; bm.bm_data = &bmParent.bm_data[static_cast<uint32_t>((y*bmParent.bm_rowsize)+x)];
} }
void decode_data(ubyte *data, uint_fast32_t num_pixels, std::array<color_t, 256> &colormap, std::array<bool, 256> &used) void decode_data(uint8_t *data, uint_fast32_t num_pixels, std::array<color_t, 256> &colormap, std::bitset<256> &used)
{ {
const auto a = [&](uint8_t mapped) { const auto a = [&](uint8_t mapped) {
return used[mapped] = true, colormap[mapped]; return used[mapped] = true, colormap[mapped];
@ -169,7 +169,7 @@ void gr_remap_bitmap_good(grs_bitmap &bmp, palette_array_t &palette, uint_fast32
if (transparent_color < colormap.size()) if (transparent_color < colormap.size())
colormap[transparent_color] = TRANSPARENCY_COLOR; colormap[transparent_color] = TRANSPARENCY_COLOR;
std::array<bool, 256> freq{}; std::bitset<256> freq{};
if (bmp.bm_w == bmp.bm_rowsize) if (bmp.bm_w == bmp.bm_rowsize)
decode_data(bmp.get_bitmap_data(), bmp.bm_w * bmp.bm_h, colormap, freq ); decode_data(bmp.get_bitmap_data(), bmp.bm_w * bmp.bm_h, colormap, freq );
else { else {

3
common/2d/bitmap.h
View file

@ -11,10 +11,11 @@
#ifdef __cplusplus #ifdef __cplusplus
#include "palette.h" #include "palette.h"
#include <array> #include <array>
#include <bitset>
namespace dcx { namespace dcx {
void build_colormap_good(const palette_array_t &palette, std::array<color_t, 256> &colormap); void build_colormap_good(const palette_array_t &palette, std::array<color_t, 256> &colormap);
void decode_data(ubyte *data, uint_fast32_t num_pixels, std::array<color_t, 256> &colormap, std::array<bool, 256> &used); void decode_data(uint8_t *data, uint_fast32_t num_pixels, std::array<color_t, 256> &colormap, std::bitset<256> &used);
} }
#endif #endif

7
similar/2d/font.cpp
View file

@ -1013,10 +1013,11 @@ static std::unique_ptr<grs_font> gr_internal_init_font(const char *fontname)
std::array<uint8_t, 256> colormap; std::array<uint8_t, 256> colormap;
/* `freq` exists so that decode_data can write to it, but it is /* `freq` exists so that decode_data can write to it, but it is
* otherwise unused. `decode_data` is not guaranteed to write * otherwise unused. `decode_data` is not guaranteed to write
* to every element, so `freq` must not be read without first * to every element, but the bitset constructor will initialize
* adding an initialization step. * the storage, so reading unwritten fields will always return
* false.
*/ */
std::array<bool, 256> freq; std::bitset<256> freq;
PHYSFS_read(fontfile,&palette[0],sizeof(palette[0]),palette.size()); //read the palette PHYSFS_read(fontfile,&palette[0],sizeof(palette[0]),palette.size()); //read the palette