diff --git a/Adafruit_GFX.cpp b/Adafruit_GFX.cpp index a812087..3dc9a6f 100755 --- a/Adafruit_GFX.cpp +++ b/Adafruit_GFX.cpp @@ -462,7 +462,7 @@ void Adafruit_GFX::fillTriangle(int16_t x0, int16_t y0, // Draw a PROGMEM-resident 1-bit image at the specified (x,y) position, // using the specified foreground color (unset bits are transparent). void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, - const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color) { + PROGMEM const uint8_t bitmap[], int16_t w, int16_t h, uint16_t color) { int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte uint8_t byte = 0; @@ -482,7 +482,8 @@ void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, // using the specified foreground (for set bits) and background (unset // bits) colors. void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, - const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color, uint16_t bg) { + PROGMEM const uint8_t bitmap[], int16_t w, int16_t h, + uint16_t color, uint16_t bg) { int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte uint8_t byte = 0; @@ -539,9 +540,11 @@ void Adafruit_GFX::drawBitmap(int16_t x, int16_t y, // Draw PROGMEM-resident XBitMap Files (*.xbm), exported from GIMP, // Usage: Export from GIMP to *.xbm, rename *.xbm to *.c and open in editor. -// C Array can be directly used with this function +// C Array can be directly used with this function. +// There is no RAM-resident version of this function; if generating bitmaps +// in RAM, use the format defined by drawBitmap() and call that instead. void Adafruit_GFX::drawXBitmap(int16_t x, int16_t y, - const uint8_t *bitmap, int16_t w, int16_t h, uint16_t color) { + PROGMEM const uint8_t bitmap[], int16_t w, int16_t h, uint16_t color) { int16_t byteWidth = (w + 7) / 8; // Bitmap scanline pad = whole byte uint8_t byte = 0; @@ -563,7 +566,7 @@ void Adafruit_GFX::drawXBitmap(int16_t x, int16_t y, // pos. Specifically for 8-bit display devices such as IS31FL3731; // no color reduction/expansion is performed. void Adafruit_GFX::drawGrayscaleBitmap(int16_t x, int16_t y, - const uint8_t *bitmap, int16_t w, int16_t h) { + PROGMEM const uint8_t bitmap[], int16_t w, int16_t h) { startWrite(); for(int16_t j=0; j sentence=Adafruit GFX graphics core library, this is the 'core' class that all our other graphics libraries derive from.