From b2e4e69f7a32b499826645afc345b0d294764f90 Mon Sep 17 00:00:00 2001 From: Bodmer Date: Sat, 27 Jan 2018 02:35:25 +0000 Subject: [PATCH] Fix Issue #81 --- TFT_eSPI.cpp | 6 +++--- TFT_eSPI.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TFT_eSPI.cpp b/TFT_eSPI.cpp index 7243981..4cb0ef9 100644 --- a/TFT_eSPI.cpp +++ b/TFT_eSPI.cpp @@ -3306,7 +3306,7 @@ void TFT_eSPI::drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color) ** Description: draw a filled rectangle ***************************************************************************************/ #if defined (ESP8266) && !defined (RPI_WRITE_STROBE) -void TFT_eSPI::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color) +void TFT_eSPI::fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color) { // rudimentary clipping (drawChar w/big text requires this) if ((x > _width) || (y > _height) || (w < 1) || (h < 1)) return; @@ -3325,7 +3325,7 @@ void TFT_eSPI::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t c #else -void TFT_eSPI::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color) +void TFT_eSPI::fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color) { // rudimentary clipping (drawChar w/big text requires this) if ((x > _width) || (y > _height) || (w < 1) || (h < 1)) return; @@ -5566,7 +5566,7 @@ void TFT_eSprite::drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color) ** Function name: fillRect ** Description: draw a filled rectangle *************************************************************************************x*/ -void TFT_eSprite::fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color) +void TFT_eSprite::fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color) { if (!_created ) return; diff --git a/TFT_eSPI.h b/TFT_eSPI.h index bb08447..84e0b00 100644 --- a/TFT_eSPI.h +++ b/TFT_eSPI.h @@ -334,7 +334,7 @@ class TFT_eSPI : public Print { drawLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t color), drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color), drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color), - fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color); + fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color); virtual int16_t drawChar(unsigned int uniCode, int x, int y, int font), drawChar(unsigned int uniCode, int x, int y); @@ -617,7 +617,7 @@ class TFT_eSprite : public TFT_eSPI { drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color), drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color), - fillRect(int32_t x, int32_t y, uint32_t w, uint32_t h, uint32_t color), + fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color), // Set the sprite text cursor position for print class (does not change the TFT screen cursor) setCursor(int16_t x, int16_t y);