Merge branch 'master' of github.com:wvdakker/TFT_eSPI

Author: wvdakker

Extensions/Sprite.cpp

@@ -776,7 +776,7 @@ bool TFT_eSprite::pushToSprite(TFT_eSprite *dspr, int32_t x, int32_t y, uint16_t
 
       if (transp == rp) {
         if (pixel_count) {
-          dspr->pushImage(ox, y, pixel_count, 1, sline_buffer, _bpp);
+          dspr->pushImage(ox, y, pixel_count, 1, sline_buffer);
           ox += pixel_count;
           pixel_count = 0;
         }

Processors/TFT_eSPI_RP2040.c

@@ -658,7 +658,7 @@ void TFT_eSPI::pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t
     }
   }
   // else, if a buffer pointer has been provided copy whole image to the buffer
-  else if (buffer != image || _swapBytes) {
+  else if (buffer != image) {
     memcpy(buffer, image, len*2);
   }
 

examples/Smooth Graphics/Anti-aliased_Clock/NTP_Time.h

@@ -4,7 +4,7 @@
 
 // Time library:
 // https://github.com/PaulStoffregen/Time
-#include <Time.h>
+#include <TimeLib.h>
 
 // Time zone correction library:
 // https://github.com/JChristensen/Timezone