merged cleanup
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
/* */
|
||||
/**********************************************/
|
||||
|
||||
#define FONTDATAMAX_8x16 4096
|
||||
constexpr unsigned int FONTDATAMAX_8x16 = 4096;
|
||||
|
||||
constexpr unsigned char fontdata_8x16[FONTDATAMAX_8x16] = {
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
/* */
|
||||
/**********************************************/
|
||||
|
||||
#define FONTDATAMAX_8x8 2048
|
||||
constexpr unsigned int FONTDATAMAX_8x8 = 2048;
|
||||
|
||||
constexpr unsigned char fontdata_8x8[FONTDATAMAX_8x8] = {
|
||||
|
||||
|
||||
@ -10,9 +10,10 @@
|
||||
/* linux-m86k) by John Shifflett */
|
||||
/* */
|
||||
/**********************************************/
|
||||
#define FONTDATAMAX_PEARL_8x8 2048
|
||||
|
||||
constexpr unsigned char fontdata_pearl_8x8[FONTDATAMAX_PEARL_8x8] = {
|
||||
constexpr const unsigned int FONTDATAMAX_PEARL_8x8 = 2048;
|
||||
|
||||
constexpr const unsigned char fontdata_pearl_8x8[FONTDATAMAX_PEARL_8x8] = {
|
||||
|
||||
/* 0 0x00 '^@' */
|
||||
0x00, /* 00000000 */
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
// vim: set et ts=4 sw=4:
|
||||
|
||||
#define FONTDATAMAX_SUN_12x22 11264
|
||||
constexpr const unsigned int FONTDATAMAX_SUN_12x22 = 11264;
|
||||
|
||||
constexpr unsigned char fontdata_sun_12x22[FONTDATAMAX_SUN_12x22] = {
|
||||
constexpr const unsigned char fontdata_sun_12x22[FONTDATAMAX_SUN_12x22] = {
|
||||
|
||||
/* 0 0x00 '^@' */
|
||||
0x00, 0x00, /* 000000000000 */
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
// vim: set et ts=4 sw=4:
|
||||
|
||||
#define FONTDATAMAX_SUN8x16 4096
|
||||
constexpr const unsigned int FONTDATAMAX_SUN8x16 = 4096;
|
||||
|
||||
constexpr unsigned char fontdata_sun_8x16[FONTDATAMAX_SUN8x16] = {
|
||||
constexpr const unsigned char fontdata_sun_8x16[FONTDATAMAX_SUN8x16] = {
|
||||
/* */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
||||
/* */ 0x00,0x00,0x7e,0x81,0xa5,0x81,0x81,0xbd,0x99,0x81,0x81,0x7e,0x00,0x00,0x00,0x00,
|
||||
/* */ 0x00,0x00,0x7e,0xff,0xdb,0xff,0xff,0xc3,0xe7,0xff,0xff,0x7e,0x00,0x00,0x00,0x00,
|
||||
|
||||
@ -8,11 +8,13 @@
|
||||
// Je nach Breite wird auf Bytegrenzen aufgerundet:
|
||||
// 8 Pixel -> 1 Byte; 12 Pixel -> 2 Byte
|
||||
|
||||
#ifndef __FONTS_H__
|
||||
#define __FONTS_H__
|
||||
#ifndef FONTS_H__
|
||||
#define FONTS_H__
|
||||
|
||||
class Font {
|
||||
public:
|
||||
virtual ~Font() = default;
|
||||
|
||||
virtual const unsigned char* getChar(int c) const = 0;
|
||||
virtual unsigned int get_char_width() const = 0;
|
||||
virtual unsigned int get_char_height() const = 0;
|
||||
|
||||
Reference in New Issue
Block a user