From 2945702efe92aace8f77ffd6a449208d09606efb Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 13 Jun 2021 12:45:16 +0200 Subject: MultiLCD: avoid all gcc warnings --- libraries/MultiLCD/MultiLCD.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'libraries/MultiLCD/MultiLCD.h') diff --git a/libraries/MultiLCD/MultiLCD.h b/libraries/MultiLCD/MultiLCD.h index 58f7a11..a757946 100644 --- a/libraries/MultiLCD/MultiLCD.h +++ b/libraries/MultiLCD/MultiLCD.h @@ -52,9 +52,9 @@ public: void setFontSize(FONT_SIZE size) { m_font = size; } void setFlags(byte flags) { m_flags = flags; } virtual void setBackLight(byte brightness) {} - virtual void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height) {} - virtual void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0) {} - virtual void draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height) {} + virtual void draw(const byte* buffer, uint16_t width, uint16_t height) {} + virtual void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0) {} + virtual void draw4bpp(const byte* buffer, uint16_t width, uint16_t height) {} virtual size_t write(uint8_t c) { return 0; } virtual byte getLines() { return 0; } virtual byte getCols() { return 0; } @@ -113,9 +113,9 @@ public: } void begin(); void clear(uint16_t x = 0, uint16_t y = 0, uint16_t width = 320, uint16_t height = 240); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); - void draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height); + void draw(const byte* buffer, uint16_t width, uint16_t height); + void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); + void draw4bpp(const byte* buffer, uint16_t width, uint16_t height); size_t write(uint8_t); void clearLine(byte line) { @@ -186,8 +186,8 @@ public: void clear(void); size_t write(uint8_t); void setBackLight(byte brightness); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); + void draw(const byte* buffer, uint16_t width, uint16_t height); + void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); private: void setXY(uint16_t x0, uint16_t x1, uint16_t y0, uint16_t y1); void sendPixelData(byte d); @@ -242,9 +242,9 @@ public: } void begin(); void clear(uint16_t x = 0, uint16_t y = 0, uint16_t width = 319, uint16_t height = 239); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); - void draw4bpp(const PROGMEM byte* buffer, uint16_t width, uint16_t height); + void draw(const byte* buffer, uint16_t width, uint16_t height); + void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); + void draw4bpp(const byte* buffer, uint16_t width, uint16_t height); size_t write(uint8_t); void clearLine(byte line) { @@ -301,9 +301,9 @@ public: } void begin(); void clear(uint16_t x = 0, uint16_t y = 0, uint16_t width = 479, uint16_t height = 319); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height); - void draw(const PROGMEM byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); - void draw2x(const PROGMEM byte* buffer, uint16_t width, uint16_t height); + void draw(const byte* buffer, uint16_t width, uint16_t height); + void draw(const byte* buffer, uint16_t width, uint16_t height, byte scaleX, byte scaleY = 0); + void draw2x(const byte* buffer, uint16_t width, uint16_t height); size_t write(uint8_t); void clearLine(byte line) { -- cgit v1.2.3