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

Remove useless cast in font.cpp

Browse source
This commit is contained in:
Kp 2016-07-15 03:43:03 +00:00
parent 80a087806e
commit a0c2ac469a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
similar/2d/font.cpp
View file

@ -811,7 +811,7 @@ void gr_get_string_size(const char *s, int *string_width, int *string_height, in
if (string_height)
{
const auto fontscale_y = FONTSCALE_Y(cv_font.ft_h);
*string_height = static_cast<int>(static_cast<float>(fontscale_y + (lines * (fontscale_y + FSPACY(1)))));
*string_height = static_cast<int>(fontscale_y + (lines * (fontscale_y + FSPACY(1))));
}
}
@ -955,7 +955,7 @@ static std::unique_ptr<grs_font> gr_internal_init_font(const char *fontname)
con_printf(CON_URGENT, "Missing data in font file %s", fontname);
return {};
}
font->ft_data = ptr = ft_data = reinterpret_cast<unsigned char *>(&font_data[offset_data]);
font->ft_data = ptr = ft_data = &font_data[offset_data];
const auto ft_chars = reinterpret_cast<const uint8_t **>(ft_allocdata.get());
font->ft_chars = reinterpret_cast<const uint8_t *const *>(ft_chars);