ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed minor compile warnings, including incorrect output from convbdf tool.

This commit is contained in:
Stephen Anthony 2020-03-15 14:02:52 -02:30
parent d3ff85cf1f
commit 1d1460924a
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/LauncherDialog.cxx
View File

@ -384,7 +384,7 @@ void LauncherDialog::setRomInfoFont(const Common::Size& area)
}; };
// Try to pick a font that works best, based on the available area // Try to pick a font that works best, based on the available area
for(int i = 0; i < sizeof(FONTS) / sizeof(FontDesc); ++i) for(size_t i = 0; i < sizeof(FONTS) / sizeof(FontDesc); ++i)
{ {
// only use fonts <= launcher fonts // only use fonts <= launcher fonts
if(instance().frameBuffer().launcherFont().getFontHeight() >= FONTS[i].height) if(instance().frameBuffer().launcherFont().getFontHeight() >= FONTS[i].height)

6
src/gui/Stella14x28tFont.hxx
View File

@ -6325,9 +6325,9 @@ static const FontDesc stella14x28tDesc = {
29, 29,
98, 98,
stella14x28t_font_bits, stella14x28t_font_bits,
0, /* no encode table*/ nullptr, /* no encode table*/
0, /* fixed width*/ nullptr, /* fixed width*/
0, /* fixed bbox*/ nullptr, /* fixed bbox*/
32, 32,
sizeof(stella14x28t_font_bits)/sizeof(uInt16) sizeof(stella14x28t_font_bits)/sizeof(uInt16)
}; };

6
src/gui/Stella16x32tFont.hxx
View File

@ -7109,9 +7109,9 @@ static const FontDesc stella16x32tDesc = {
29, 29,
98, 98,
stella16x32t_font_bits, stella16x32t_font_bits,
0, /* no encode table*/ nullptr, /* no encode table*/
0, /* fixed width*/ nullptr, /* fixed width*/
0, /* fixed bbox*/ nullptr, /* fixed bbox*/
32, 32,
sizeof(stella16x32t_font_bits)/sizeof(uInt16) sizeof(stella16x32t_font_bits)/sizeof(uInt16)
}; };

6
src/tools/convbdf.c
View File

@ -936,17 +936,17 @@ int gen_c_source(struct font* pf, char *path)
if (pf->offset) if (pf->offset)
sprintf(obuf, "%s_sysfont_offset,", fontname); sprintf(obuf, "%s_sysfont_offset,", fontname);
else else
sprintf(obuf, "0, /* no encode table*/"); sprintf(obuf, "nullptr, /* no encode table*/");
if (pf->width) if (pf->width)
sprintf(buf, "%s_sysfont_width,", fontname); sprintf(buf, "%s_sysfont_width,", fontname);
else else
sprintf(buf, "0, /* fixed width*/"); sprintf(buf, "nullptr, /* fixed width*/");
if (pf->bbx) if (pf->bbx)
sprintf(bbuf, "%s_sysfont_bbx,", fontname); sprintf(bbuf, "%s_sysfont_bbx,", fontname);
else else
sprintf(bbuf, "0, /* fixed bbox*/"); sprintf(bbuf, "nullptr, /* fixed bbox*/");
fprintf(ofp, fprintf(ofp,
"/* Exported structure definition. */\n" "/* Exported structure definition. */\n"