From 3f04f9756d0498bb2fa22bb07980c6a15f227b8d Mon Sep 17 00:00:00 2001 From: nitko12 Date: Tue, 15 Sep 2020 14:01:22 +0200 Subject: [PATCH] Minor fixes, deprecation mark. --- .../1-Game_Of_Life_by_claud9999.ino | 0 src/include/Image.h | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename examples/5. Community Contributions/1-Game_Of_Life_by_claud9999/{ => 1-Game_Of_Life_by_claud9999}/1-Game_Of_Life_by_claud9999.ino (100%) diff --git a/examples/5. Community Contributions/1-Game_Of_Life_by_claud9999/1-Game_Of_Life_by_claud9999.ino b/examples/5. Community Contributions/1-Game_Of_Life_by_claud9999/1-Game_Of_Life_by_claud9999/1-Game_Of_Life_by_claud9999.ino similarity index 100% rename from examples/5. Community Contributions/1-Game_Of_Life_by_claud9999/1-Game_Of_Life_by_claud9999.ino rename to examples/5. Community Contributions/1-Game_Of_Life_by_claud9999/1-Game_Of_Life_by_claud9999/1-Game_Of_Life_by_claud9999.ino diff --git a/src/include/Image.h b/src/include/Image.h index 8ebc650..527ae4f 100644 --- a/src/include/Image.h +++ b/src/include/Image.h @@ -33,24 +33,24 @@ public: bool drawBitmapFromBuffer(uint8_t *buf, int x, int y, bool dither, bool invert); - bool drawBitmapFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0); + [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawBitmapFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0); bool drawBitmapFromSd(SdFile *p, int x, int y, bool dither = 0, bool invert = 0); - bool drawBitmapFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0); + [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawBitmapFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0); bool drawBitmapFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither = 0, bool invert = 0); bool drawJpegFromBuffer(uint8_t *buf, int32_t len, int x, int y, bool dither, bool invert); - bool drawJpegFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0); + [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawJpegFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0); bool drawJpegFromSd(SdFile *p, int x, int y, bool dither = 0, bool invert = 0); - bool drawJpegFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0); + [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawJpegFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0); bool drawJpegFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither = 0, bool invert = 0); - bool drawPngFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0); + [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawPngFromSd(const char *fileName, int x, int y, bool dither = 0, bool invert = 0); bool drawPngFromSd(SdFile *p, int x, int y, bool dither = 0, bool invert = 0); - bool drawPngFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0); + [[deprecated("Use drawImage, as this will soon become a private method.")]] bool drawPngFromWeb(const char *url, int x, int y, bool dither = 0, bool invert = 0); bool drawPngFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither = 0, bool invert = 0); private: