fleg
/
Arduboy2
mirror of https://github.com/MLXXXp/Arduboy2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Arduboy2.cpp
View File

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