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

Simplify palette color tracking

Browse source 
Callers only care whether a color is used, not how often it is used.
This commit is contained in:
Kp 2018-03-08 04:21:18 +00:00
parent fa5d8b0be0
commit b6e2205b9f
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/2d/bitmap.cpp
View file

@ -135,10 +135,10 @@ 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(ubyte *data, uint_fast32_t num_pixels, array<color_t, 256> &colormap, array<unsigned, 256> &count)
void decode_data(ubyte *data, uint_fast32_t num_pixels, array<color_t, 256> &colormap, array<bool, 256> &used)
{
const auto a = [&](uint8_t mapped) {
return ++count[mapped], colormap[mapped];
return used[mapped] = true, colormap[mapped];
};
std::transform(data, data + num_pixels, data, a);
}
@ -148,7 +148,7 @@ static void gr_set_super_transparent(grs_bitmap &bm, bool bOpaque)
bm.set_flag_mask(!bOpaque, BM_FLAG_SUPER_TRANSPARENT);
}
void build_colormap_good(const palette_array_t &palette, array<color_t, 256> &colormap, array<unsigned, 256> &freq)
void build_colormap_good(const palette_array_t &palette, array<color_t, 256> &colormap, array<bool, 256> &freq)
{
const auto a = [](const rgb_t &p) {
return gr_find_closest_color(p.r, p.g, p.b);
@ -160,7 +160,7 @@ void build_colormap_good(const palette_array_t &palette, array<color_t, 256> &co
void gr_remap_bitmap_good(grs_bitmap &bmp, palette_array_t &palette, uint_fast32_t transparent_color, uint_fast32_t super_transparent_color)
{
array<uint8_t, 256> colormap;
array<unsigned, 256> freq;
array<bool, 256> freq;
build_colormap_good( palette, colormap, freq );
if (super_transparent_color < colormap.size())

4
common/2d/bitmap.h
View file

@ -13,8 +13,8 @@
#include "compiler-array.h"
namespace dcx {
void build_colormap_good(const palette_array_t &palette, array<color_t, 256> &colormap, array<unsigned, 256> &freq);
void decode_data(ubyte *data, uint_fast32_t num_pixels, array<color_t, 256> &colormap, array<unsigned, 256> &count);
void build_colormap_good(const palette_array_t &palette, array<color_t, 256> &colormap, array<bool, 256> &used);
void decode_data(ubyte *data, uint_fast32_t num_pixels, array<color_t, 256> &colormap, array<bool, 256> &used);
}
#endif

2
similar/2d/font.cpp
View file

@ -1004,7 +1004,7 @@ static std::unique_ptr<grs_font> gr_internal_init_font(const char *fontname)
if (font->ft_flags & FT_COLOR) { //remap palette
palette_array_t palette;
array<uint8_t, 256> colormap;
array<unsigned, 256> freq;
array<bool, 256> freq;
PHYSFS_read(fontfile,&palette[0],sizeof(palette[0]),palette.size()); //read the palette

2
similar/main/piggy.cpp
View file

@ -1778,7 +1778,7 @@ static int get_d1_colormap( palette_array_t &d1_palette, array<color_t, 256> &co
if (!palette_file || PHYSFS_fileLength(palette_file) != 9472)
return -1;
PHYSFS_read( palette_file, &d1_palette[0], sizeof(d1_palette[0]), d1_palette.size() );
array<unsigned, 256> freq;
array<bool, 256> freq;
build_colormap_good( d1_palette, colormap, freq );
// don't change transparencies:
colormap[254] = 254;