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

manually deal with clang spaces

Browse source
This commit is contained in:
Liz 2025-08-01 11:16:33 -04:00
parent a3086d3c22
commit 5f7c29566d
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Adafruit_ImageReader.cpp
View file

@ -529,8 +529,8 @@ ImageReturnCode Adafruit_ImageReader::coreBMP(
} }
} else { // Canvas is simpler, } else { // Canvas is simpler,
file.read(sdbuf, sizeof sdbuf); // just load sdbuf file.read(sdbuf, sizeof sdbuf); // just load sdbuf
} // (destidx never resets) } // (destidx never resets)
srcidx = 0; // Reset bmp buf index srcidx = 0; // Reset bmp buf index
} }
if (depth == 24) { if (depth == 24) {
// Convert each pixel from BMP to 565 format, save in dest // Convert each pixel from BMP to 565 format, save in dest
@ -564,7 +564,7 @@ ImageReturnCode Adafruit_ImageReader::coreBMP(
} }
} }
} }
} // end pixel loop } // end pixel loop
if (tft) { // Drawing to TFT? if (tft) { // Drawing to TFT?
if (destidx) { // Any remainders? if (destidx) { // Any remainders?
// See notes above re: DMA // See notes above re: DMA
@ -584,11 +584,11 @@ ImageReturnCode Adafruit_ImageReader::coreBMP(
img->palette = quantized; // Keep palette with img img->palette = quantized; // Keep palette with img
} }
} // end depth>24 or quantized malloc OK } // end depth>24 or quantized malloc OK
} // end top/left clip } // end top/left clip
} // end malloc check } // end malloc check
} // end depth check } // end depth check
} // end planes/compression check } // end planes/compression check
} // end signature } // end signature
file.close(); file.close();
return status; return status;

16
Adafruit_ImageReader_EPD.cpp
View file

@ -454,8 +454,8 @@ ImageReturnCode Adafruit_ImageReader_EPD::coreBMP(
} }
} else { // Canvas is simpler, } else { // Canvas is simpler,
file.read(sdbuf, sizeof sdbuf); // just load sdbuf file.read(sdbuf, sizeof sdbuf); // just load sdbuf
} // (destidx never resets) } // (destidx never resets)
srcidx = 0; // Reset bmp buf index srcidx = 0; // Reset bmp buf index
} }
if (depth == 24) { if (depth == 24) {
// Convert each pixel from BMP to 565 format, save in dest // Convert each pixel from BMP to 565 format, save in dest
@ -490,7 +490,7 @@ ImageReturnCode Adafruit_ImageReader_EPD::coreBMP(
} }
} }
} }
} // end pixel loop } // end pixel loop
if (epd) { // Drawing to TFT? if (epd) { // Drawing to TFT?
if (destidx) { // Any remainders? if (destidx) { // Any remainders?
uint16_t index = 0; uint16_t index = 0;
@ -516,11 +516,11 @@ ImageReturnCode Adafruit_ImageReader_EPD::coreBMP(
img->palette = quantized; // Keep palette with img img->palette = quantized; // Keep palette with img
} }
} // end depth>24 or quantized malloc OK } // end depth>24 or quantized malloc OK
} // end top/left clip } // end top/left clip
} // end malloc check } // end malloc check
} // end depth check } // end depth check
} // end planes/compression check } // end planes/compression check
} // end signature } // end signature
file.close(); file.close();
return status; return status;