diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
| commit | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch) | |
| tree | 95cf152ef65ff19c7b2515b427bbe86b92b611d0 /tools | |
| parent | 8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff) | |
| download | uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.gz uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.bz2 uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.zip | |
For all source files update integer types to the new gI8 etc type names
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mcufontencoder/src/export_bwfont.cc | 6 | ||||
| -rw-r--r-- | tools/mcufontencoder/src/export_rlefont.cc | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/mcufontencoder/src/export_bwfont.cc b/tools/mcufontencoder/src/export_bwfont.cc index 9b97fb9c..c367a20e 100644 --- a/tools/mcufontencoder/src/export_bwfont.cc +++ b/tools/mcufontencoder/src/export_bwfont.cc @@ -134,12 +134,12 @@ static void encode_character_range(std::ostream &out, } offsets.push_back(data.size() / stride); - write_const_table(out, data, "uint8_t", "mf_bwfont_" + name + "_glyph_data_" + std::to_string(range_index)); + write_const_table(out, data, "gU8", "mf_bwfont_" + name + "_glyph_data_" + std::to_string(range_index)); if (!constant_width) { - write_const_table(out, offsets, "uint16_t", "mf_bwfont_" + name + "_glyph_offsets_" + std::to_string(range_index), 4); - write_const_table(out, widths, "uint8_t", "mf_bwfont_" + name + "_glyph_widths_" + std::to_string(range_index)); + write_const_table(out, offsets, "gU16", "mf_bwfont_" + name + "_glyph_offsets_" + std::to_string(range_index), 4); + write_const_table(out, widths, "gU8", "mf_bwfont_" + name + "_glyph_widths_" + std::to_string(range_index)); } } diff --git a/tools/mcufontencoder/src/export_rlefont.cc b/tools/mcufontencoder/src/export_rlefont.cc index 4b7272d4..8c76325c 100644 --- a/tools/mcufontencoder/src/export_rlefont.cc +++ b/tools/mcufontencoder/src/export_rlefont.cc @@ -36,8 +36,8 @@ static void encode_dictionary(std::ostream &out, } offsets.push_back(data.size()); - write_const_table(out, data, "uint8_t", "mf_rlefont_" + name + "_dictionary_data"); - write_const_table(out, offsets, "uint16_t", "mf_rlefont_" + name + "_dictionary_offsets", 4); + write_const_table(out, data, "gU8", "mf_rlefont_" + name + "_dictionary_data"); + write_const_table(out, offsets, "gU16", "mf_rlefont_" + name + "_dictionary_offsets", 4); } // Encode the data tables for a single character range. @@ -78,8 +78,8 @@ static void encode_character_range(std::ostream &out, } } - write_const_table(out, data, "uint8_t", "mf_rlefont_" + name + "_glyph_data_" + std::to_string(range_index)); - write_const_table(out, offsets, "uint16_t", "mf_rlefont_" + name + "_glyph_offsets_" + std::to_string(range_index), 4); + write_const_table(out, data, "gU8", "mf_rlefont_" + name + "_glyph_data_" + std::to_string(range_index)); + write_const_table(out, offsets, "gU16", "mf_rlefont_" + name + "_glyph_offsets_" + std::to_string(range_index), 4); } void write_source(std::ostream &out, std::string name, const DataFile &datafile) |