Commit 43862876 authored by Bodmer's avatar Bodmer

Permit larger anti-aliased fonts

Size limit for anti-aliased fonts raised to ~200 pixels
parent 1edfe6c6
...@@ -124,7 +124,7 @@ void TFT_eSPI::loadMetrics(uint16_t gCount) ...@@ -124,7 +124,7 @@ void TFT_eSPI::loadMetrics(uint16_t gCount)
gHeight = (uint8_t*)malloc( gCount ); // Height of glyph gHeight = (uint8_t*)malloc( gCount ); // Height of glyph
gWidth = (uint8_t*)malloc( gCount ); // Width of glyph gWidth = (uint8_t*)malloc( gCount ); // Width of glyph
gxAdvance = (uint8_t*)malloc( gCount ); // xAdvance - to move x cursor gxAdvance = (uint8_t*)malloc( gCount ); // xAdvance - to move x cursor
gdY = (int8_t*)malloc( gCount ); // offset from bitmap top edge from lowest point in any character gdY = (int16_t*)malloc( gCount * 2); // offset from bitmap top edge from lowest point in any character
gdX = (int8_t*)malloc( gCount ); // offset for bitmap left edge relative to cursor X gdX = (int8_t*)malloc( gCount ); // offset for bitmap left edge relative to cursor X
gBitmap = (uint32_t*)malloc( gCount * 4); // seek pointer to glyph bitmap in SPIFFS file gBitmap = (uint32_t*)malloc( gCount * 4); // seek pointer to glyph bitmap in SPIFFS file
...@@ -141,7 +141,7 @@ void TFT_eSPI::loadMetrics(uint16_t gCount) ...@@ -141,7 +141,7 @@ void TFT_eSPI::loadMetrics(uint16_t gCount)
gHeight[gNum] = (uint8_t)readInt32(); // Height of glyph gHeight[gNum] = (uint8_t)readInt32(); // Height of glyph
gWidth[gNum] = (uint8_t)readInt32(); // Width of glyph gWidth[gNum] = (uint8_t)readInt32(); // Width of glyph
gxAdvance[gNum] = (uint8_t)readInt32(); // xAdvance - to move x cursor gxAdvance[gNum] = (uint8_t)readInt32(); // xAdvance - to move x cursor
gdY[gNum] = (int8_t)readInt32(); // y delta from baseline gdY[gNum] = (int16_t)readInt32(); // y delta from baseline
gdX[gNum] = (int8_t)readInt32(); // x delta from cursor gdX[gNum] = (int8_t)readInt32(); // x delta from cursor
readInt32(); // ignored readInt32(); // ignored
......
...@@ -35,7 +35,7 @@ fontMetrics gFont = { 0, 0, 0, 0, 0, 0, 0 }; ...@@ -35,7 +35,7 @@ fontMetrics gFont = { 0, 0, 0, 0, 0, 0, 0 };
uint8_t* gHeight = NULL; //cheight uint8_t* gHeight = NULL; //cheight
uint8_t* gWidth = NULL; //cwidth uint8_t* gWidth = NULL; //cwidth
uint8_t* gxAdvance = NULL; //setWidth uint8_t* gxAdvance = NULL; //setWidth
int8_t* gdY = NULL; //topExtent int16_t* gdY = NULL; //topExtent
int8_t* gdX = NULL; //leftExtent int8_t* gdX = NULL; //leftExtent
uint32_t* gBitmap = NULL; //file pointer to greyscale bitmap uint32_t* gBitmap = NULL; //file pointer to greyscale bitmap
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment