update TouchGFX to 4.25.0 and ignore all touchgfx_backups
This commit is contained in:
@ -0,0 +1,42 @@
|
||||
/* DO NOT EDIT THIS FILE */
|
||||
/* This file is autogenerated by the text-database code generator */
|
||||
|
||||
#ifndef TOUCHGFX_COMPRESSEDFONTCACHE_HPP
|
||||
#define TOUCHGFX_COMPRESSEDFONTCACHE_HPP
|
||||
|
||||
#include <touchgfx/hal/Types.hpp>
|
||||
#include <touchgfx/Font.hpp>
|
||||
|
||||
namespace touchgfx
|
||||
{
|
||||
class CompressedFontCache
|
||||
{
|
||||
public:
|
||||
static void clearCache();
|
||||
static const uint8_t* hasCachedGlyph(const GlyphNode* glyphNode);
|
||||
static void unableToCache(const GlyphNode* glyphNode, int byteSize);
|
||||
static const uint8_t* cacheGlyph(const GlyphNode* glyph, const uint8_t* compressedData);
|
||||
static int usedMemory()
|
||||
{
|
||||
return pixelsTop - (uint8_t*)bitmapFontCache + glyphsAllocated * sizeof(BitmapFontCacheKey);
|
||||
}
|
||||
|
||||
static int cacheClearCounter;
|
||||
private:
|
||||
static uint8_t* decompressGlyph(uint8_t* pixelsTop, const GlyphNode* glyphNode, const uint8_t* compressedData);
|
||||
|
||||
struct BitmapFontCacheKey
|
||||
{
|
||||
const void* glyphNode;
|
||||
const uint8_t* pixels;
|
||||
};
|
||||
|
||||
static const int cacheSizeBytes = 4096;
|
||||
static const int cacheWords = (cacheSizeBytes + 3) / 4;
|
||||
static uint32_t bitmapFontCache[cacheWords];
|
||||
static uint8_t* pixelsTop;
|
||||
static int glyphsAllocated;
|
||||
};
|
||||
} // namespace touchgfx
|
||||
|
||||
#endif // TOUCHGFX_COMPRESSEDFONTCACHE_HPP
|
||||
@ -0,0 +1,46 @@
|
||||
/* DO NOT EDIT THIS FILE */
|
||||
/* This file is autogenerated by the text-database code generator */
|
||||
|
||||
#ifndef TOUCHGFX_COMPRESSEDUNMAPPEDFONTCACHE_HPP
|
||||
#define TOUCHGFX_COMPRESSEDUNMAPPEDFONTCACHE_HPP
|
||||
|
||||
#include <touchgfx/hal/FlashDataReader.hpp>
|
||||
#include <touchgfx/hal/Types.hpp>
|
||||
#include <touchgfx/Font.hpp>
|
||||
|
||||
namespace touchgfx
|
||||
{
|
||||
class CompressedUnmappedFontCache
|
||||
{
|
||||
public:
|
||||
static void clearCache();
|
||||
static const GlyphNode* hasCachedGlyphNode(const GlyphNode* glyphNode);
|
||||
static const GlyphNode* hasCachedGlyphData(const GlyphNode* glyphNode, const uint8_t*& pixelData);
|
||||
static void unableToCache(const GlyphNode* glyphNode, int byteSize);
|
||||
static GlyphNode* cacheGlyphNode(const GlyphNode* glyph);
|
||||
static const uint8_t* cacheGlyphData(const GlyphNode* glyph, const uint8_t* compressedData, touchgfx::FlashDataReader* reader);
|
||||
static int usedMemory()
|
||||
{
|
||||
return pixelsTop - (uint8_t*)bitmapFontCache + glyphsAllocated * sizeof(BitmapFontCacheKey);
|
||||
}
|
||||
|
||||
static int cacheClearCounter;
|
||||
private:
|
||||
static uint8_t* decompressGlyph(uint8_t* pixelsTop, const GlyphNode* glyphNode, const uint8_t* compressedData, touchgfx::FlashDataReader* reader);
|
||||
|
||||
struct BitmapFontCacheKey
|
||||
{
|
||||
const void* glyphNodeSrc;
|
||||
GlyphNode glyphNodeCopy;
|
||||
const uint8_t* pixels;
|
||||
};
|
||||
|
||||
static const int cacheSizeBytes = 4096;
|
||||
static const int cacheWords = (cacheSizeBytes + 3) / 4;
|
||||
static uint32_t bitmapFontCache[cacheWords];
|
||||
static uint8_t* pixelsTop;
|
||||
static int glyphsAllocated;
|
||||
};
|
||||
} // namespace touchgfx
|
||||
|
||||
#endif // TOUCHGFX_COMPRESSEDUNMAPPEDFONTCACHE_HPP
|
||||
@ -210,6 +210,18 @@ private:
|
||||
arabicTable = &contextualForms;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
class CompressedMappedFont : public GeneratedFont
|
||||
{
|
||||
public:
|
||||
CompressedMappedFont(const GlyphNode* glyphs, uint16_t numGlyphs, uint16_t height, uint16_t baseline, uint8_t pixAboveTop, uint8_t pixBelowBottom, uint8_t bitsPerPixel, uint8_t byteAlignRow, uint8_t maxLeft, uint8_t maxRight, const uint8_t* const* glyphDataInternalFlash, const KerningNode* kerningList, const Unicode::UnicodeChar fallbackChar, const Unicode::UnicodeChar ellipsisChar, const uint16_t* const gsubData, const FontContextualFormsTable* formsTable);
|
||||
|
||||
using GeneratedFont::getGlyph;
|
||||
virtual const GlyphNode* getGlyph(Unicode::UnicodeChar unicode) const;
|
||||
virtual const uint8_t* getPixelData(const GlyphNode* glyph) const;
|
||||
};
|
||||
|
||||
} // namespace touchgfx
|
||||
|
||||
#endif // TOUCHGFX_GENERATEDFONT_HPP
|
||||
|
||||
@ -121,6 +121,17 @@ protected:
|
||||
|
||||
static GlyphNode glyphNodeBuffer; ///< Buffer for GlyphNodes read from unmapped flash
|
||||
};
|
||||
|
||||
class CompressedUnmappedDataFont : public UnmappedDataFont
|
||||
{
|
||||
public:
|
||||
CompressedUnmappedDataFont(const GlyphNode* glyphs, const uint16_t* unicodes, uint16_t numGlyphs, uint16_t height, uint16_t baseline, uint8_t pixAboveTop, uint8_t pixBelowBottom, uint8_t bitsPerPixel, uint8_t byteAlignRow, uint8_t maxLeft, uint8_t maxRight, const uint8_t* const* glyphDataList, const KerningNode* kerningList, const Unicode::UnicodeChar fallbackChar, const Unicode::UnicodeChar ellipsisChar, const uint16_t* const gsubData, const FontContextualFormsTable* formsTable);
|
||||
|
||||
virtual const GlyphNode* getGlyph(Unicode::UnicodeChar unicode) const;
|
||||
virtual const GlyphNode* getGlyph(Unicode::UnicodeChar unicode, const uint8_t*& pixelData, uint8_t& bitsPerPixel) const;
|
||||
virtual const uint8_t* getPixelData(const GlyphNode* glyph) const;
|
||||
};
|
||||
|
||||
} // namespace touchgfx
|
||||
|
||||
#endif // TOUCHGFX_UNMAPPEDDATAFONT_HPP
|
||||
|
||||
Reference in New Issue
Block a user