Eliminate mismatched type warning in drawChar()

Also changed a loop index from int8_t to uint8_t to match other loops.
This commit is contained in:
Scott Allen 2017-04-13 21:48:49 -04:00
parent ae8e284d41
commit 96b53875b5
1 changed files with 3 additions and 3 deletions

View File

@ -1161,7 +1161,7 @@ void Arduboy2::drawChar
{
uint8_t line;
bool draw_background = bg != color;
uint8_t *bitmap = font + c*5;
const unsigned char* bitmap = font + c * 5;
if ((x >= WIDTH) || // Clip right
(y >= HEIGHT) || // Clip bottom
@ -1172,14 +1172,14 @@ void Arduboy2::drawChar
return;
}
for (uint8_t i=0; i<6; i++ )
for (uint8_t i = 0; i < 6; i++ )
{
line = pgm_read_byte(bitmap++);
if (i == 5) {
line = 0x0;
}
for (int8_t j = 0; j<8; j++)
for (uint8_t j = 0; j < 8; j++)
{
uint8_t draw_color = (line & 0x1) ? color : bg;