ESP8266 compiler compatibility update #361

Bodmer · web-flow · commit da2239f4c171 · 2019-05-20T12:35:17.000+01:00
diff --git a/Extensions/Sprite.cpp b/Extensions/Sprite.cpp
@@ -1679,7 +1679,8 @@ int16_t TFT_eSprite::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t fo
     if ((font>2) && (font<9))
     {
       // This is slower than above but is more convenient for the RLE fonts
-      flash_address = pgm_read_dword( pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCode*sizeof(void *) );
+      // flash_address = pgm_read_dword( pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCode*sizeof(void *) );
+      flash_address = pgm_read_dword( (const void*)pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCode*sizeof(void *) );
       width = pgm_read_byte( (uint8_t *)pgm_read_dword( &(fontdata[font].widthtbl ) ) + uniCode );
       height= pgm_read_byte( &fontdata[font].height );
     }

Original file line number	Diff line number	Diff line change
`@@ -1679,7 +1679,8 @@ int16_t TFT_eSprite::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t fo`
`1679`	`1679`	`if ((font>2) && (font<9))`
`1680`	`1680`	`{`
`1681`	`1681`	`// This is slower than above but is more convenient for the RLE fonts`
`1682`		`- flash_address = pgm_read_dword( pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCodesizeof(void ) );`
	`1682`	`+ // flash_address = pgm_read_dword( pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCodesizeof(void ) );`
	`1683`	`+ flash_address = pgm_read_dword( (const void)pgm_read_dword( &(fontdata[font].chartbl ) ) + uniCodesizeof(void *) );`
`1683`	`1684`	`width = pgm_read_byte( (uint8_t *)pgm_read_dword( &(fontdata[font].widthtbl ) ) + uniCode );`
`1684`	`1685`	`height= pgm_read_byte( &fontdata[font].height );`
`1685`	`1686`	`}`