adafruit-mirror/Adafruit_ImageReader
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clang again

Browse source
This commit is contained in:
Liz 2025-08-01 09:27:48 -04:00
parent 94bbaf973f
commit 04b3d3f7b7
2 changed files with 65 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Adafruit_ImageReader.cpp
View file

@ -73,7 +73,9 @@ Adafruit_Image::Adafruit_Image(void)
@brief Destructor.
@return None (void).
*/
Adafruit_Image::~Adafruit_Image(void) { dealloc(); }
Adafruit_Image::~Adafruit_Image(void) {
dealloc();
}
/*!
@brief Deallocates memory associated with Adafruit_Image object
@ -214,7 +216,9 @@ void Adafruit_Image::draw(Adafruit_SPITFT &tft, int16_t x, int16_t y) {
often be in pre-setup() declaration, but DOES need initializing
before any of the image loading or size functions are called!
*/
Adafruit_ImageReader::Adafruit_ImageReader(FatVolume &fs) { filesys = &fs; }
Adafruit_ImageReader::Adafruit_ImageReader(FatVolume& fs) {
filesys = &fs;
}
/*!
@brief Destructor.
@ -608,7 +612,6 @@ ImageReturnCode Adafruit_ImageReader::coreBMP(
ImageReturnCode Adafruit_ImageReader::bmpDimensions(const char* filename,
int32_t* width,
int32_t* height) {
ImageReturnCode status = IMAGE_ERR_FILE_NOT_FOUND; // Guilty until innocent
if ((file = filesys->open(filename, FILE_READ))) { // Open requested file

12
Adafruit_ImageReader.h
View file

@ -51,20 +51,26 @@ public:
a GFXcanvas8, IMAGE_16 for a GFXcanvas16, IMAGE_NONE if no
canvas currently allocated.
*/
ImageFormat getFormat(void) const { return (ImageFormat)format; }
ImageFormat getFormat(void) const {
return (ImageFormat)format;
}
void* getCanvas(void) const;
/*!
@brief Return pointer to color palette.
@return Pointer to an array of 16-bit color values, or NULL if no
palette associated with image.
*/
uint16_t *getPalette(void) const { return palette; }
uint16_t* getPalette(void) const {
return palette;
}
/*!
@brief Return pointer to 1bpp image mask canvas.
@return GFXcanvas1* pointer (1-bit RAM-resident image) if present,
NULL otherwise.
*/
GFXcanvas1 *getMask(void) const { return mask; };
GFXcanvas1* getMask(void) const {
return mask;
};
protected:
// MOST OF THESE ARE NOT SUPPORTED YET -- WIP