Compare commits
2 commits
master
...
fix-warnin
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a58a4a7cbc | ||
|
|
e5d5379269 |
4 changed files with 8 additions and 8 deletions
|
|
@ -246,7 +246,7 @@ Adafruit_ImageReader::~Adafruit_ImageReader(void) {
|
||||||
@return One of the ImageReturnCode values (IMAGE_SUCCESS on successful
|
@return One of the ImageReturnCode values (IMAGE_SUCCESS on successful
|
||||||
completion, other values on failure).
|
completion, other values on failure).
|
||||||
*/
|
*/
|
||||||
ImageReturnCode Adafruit_ImageReader::drawBMP(char *filename,
|
ImageReturnCode Adafruit_ImageReader::drawBMP(const char *filename,
|
||||||
Adafruit_SPITFT &tft, int16_t x,
|
Adafruit_SPITFT &tft, int16_t x,
|
||||||
int16_t y, boolean transact) {
|
int16_t y, boolean transact) {
|
||||||
uint16_t tftbuf[BUFPIXELS]; // Temp space for buffering TFT data
|
uint16_t tftbuf[BUFPIXELS]; // Temp space for buffering TFT data
|
||||||
|
|
@ -270,7 +270,7 @@ ImageReturnCode Adafruit_ImageReader::drawBMP(char *filename,
|
||||||
@return One of the ImageReturnCode values (IMAGE_SUCCESS on successful
|
@return One of the ImageReturnCode values (IMAGE_SUCCESS on successful
|
||||||
completion, other values on failure).
|
completion, other values on failure).
|
||||||
*/
|
*/
|
||||||
ImageReturnCode Adafruit_ImageReader::loadBMP(char *filename,
|
ImageReturnCode Adafruit_ImageReader::loadBMP(const char *filename,
|
||||||
Adafruit_Image &img) {
|
Adafruit_Image &img) {
|
||||||
// Call core BMP-reading function. TFT and working buffer are NULL
|
// Call core BMP-reading function. TFT and working buffer are NULL
|
||||||
// (unused and allocated in function, respectively), X & Y position are
|
// (unused and allocated in function, respectively), X & Y position are
|
||||||
|
|
@ -308,7 +308,7 @@ ImageReturnCode Adafruit_ImageReader::loadBMP(char *filename,
|
||||||
completion, other values on failure).
|
completion, other values on failure).
|
||||||
*/
|
*/
|
||||||
ImageReturnCode Adafruit_ImageReader::coreBMP(
|
ImageReturnCode Adafruit_ImageReader::coreBMP(
|
||||||
char *filename, // SD file to load
|
const char *filename, // SD file to load
|
||||||
Adafruit_SPITFT *tft, // Pointer to TFT object, or NULL if to image
|
Adafruit_SPITFT *tft, // Pointer to TFT object, or NULL if to image
|
||||||
uint16_t *dest, // TFT working buffer, or NULL if to canvas
|
uint16_t *dest, // TFT working buffer, or NULL if to canvas
|
||||||
int16_t x, // Position if loading to TFT (else ignored)
|
int16_t x, // Position if loading to TFT (else ignored)
|
||||||
|
|
@ -605,7 +605,7 @@ ImageReturnCode Adafruit_ImageReader::coreBMP(
|
||||||
@return One of the ImageReturnCode values (IMAGE_SUCCESS on successful
|
@return One of the ImageReturnCode values (IMAGE_SUCCESS on successful
|
||||||
completion, other values on failure).
|
completion, other values on failure).
|
||||||
*/
|
*/
|
||||||
ImageReturnCode Adafruit_ImageReader::bmpDimensions(char *filename,
|
ImageReturnCode Adafruit_ImageReader::bmpDimensions(const char *filename,
|
||||||
int32_t *width,
|
int32_t *width,
|
||||||
int32_t *height) {
|
int32_t *height) {
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -96,16 +96,16 @@ class Adafruit_ImageReader {
|
||||||
public:
|
public:
|
||||||
Adafruit_ImageReader(FatFileSystem &fs);
|
Adafruit_ImageReader(FatFileSystem &fs);
|
||||||
~Adafruit_ImageReader(void);
|
~Adafruit_ImageReader(void);
|
||||||
ImageReturnCode drawBMP(char *filename, Adafruit_SPITFT &tft, int16_t x,
|
ImageReturnCode drawBMP(const char *filename, Adafruit_SPITFT &tft, int16_t x,
|
||||||
int16_t y, boolean transact = true);
|
int16_t y, boolean transact = true);
|
||||||
ImageReturnCode loadBMP(char *filename, Adafruit_Image &img);
|
ImageReturnCode loadBMP(const char *filename, Adafruit_Image &img);
|
||||||
ImageReturnCode bmpDimensions(char *filename, int32_t *w, int32_t *h);
|
ImageReturnCode bmpDimensions(const char *filename, int32_t *w, int32_t *h);
|
||||||
void printStatus(ImageReturnCode stat, Stream &stream = Serial);
|
void printStatus(ImageReturnCode stat, Stream &stream = Serial);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
FatFileSystem *filesys; ///< FAT FileSystem Object
|
FatFileSystem *filesys; ///< FAT FileSystem Object
|
||||||
File file; ///< Current Open file
|
File file; ///< Current Open file
|
||||||
ImageReturnCode coreBMP(char *filename, Adafruit_SPITFT *tft, uint16_t *dest,
|
ImageReturnCode coreBMP(const char *filename, Adafruit_SPITFT *tft, uint16_t *dest,
|
||||||
int16_t x, int16_t y, Adafruit_Image *img,
|
int16_t x, int16_t y, Adafruit_Image *img,
|
||||||
boolean transact);
|
boolean transact);
|
||||||
uint16_t readLE16(void);
|
uint16_t readLE16(void);
|
||||||
|
|
|
||||||
0
examples/FeatherWingST7735/.uno.test.skip
Normal file
0
examples/FeatherWingST7735/.uno.test.skip
Normal file
0
examples/ShieldST7735/.uno.test.skip
Normal file
0
examples/ShieldST7735/.uno.test.skip
Normal file
Loading…
Reference in a new issue