eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Drop FsFile alias, use HalFile in downstream code (#2141)

Browse Source
This commit is contained in:
Zach Nelson
2026-05-25 16:26:54 -04:00
committed by GitHub
parent d7797baff2
commit e9120888fa
63 changed files with 201 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/GfxRenderer/Bitmap.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ Bitmap::~Bitmap() {
delete fsDitherer;
}
uint16_t Bitmap::readLE16(FsFile& f) {
uint16_t Bitmap::readLE16(HalFile& f) {
const int c0 = f.read();
const int c1 = f.read();
const auto b0 = static_cast<uint8_t>(c0 < 0 ? 0 : c0);
@@ -29,7 +29,7 @@ uint16_t Bitmap::readLE16(FsFile& f) {
return static_cast<uint16_t>(b0) | (static_cast<uint16_t>(b1) << 8);
}
uint32_t Bitmap::readLE32(FsFile& f) {
uint32_t Bitmap::readLE32(HalFile& f) {
const int c0 = f.read();
const int c1 = f.read();
const int c2 = f.read();
lib/GfxRenderer/Bitmap.h
+4 -4
View File
@@ -64,7 +64,7 @@ class Bitmap {
public:
static const char* errorToString(BmpReaderError err);
explicit Bitmap(FsFile& file, bool dithering = false) : file(file), dithering(dithering) {}
explicit Bitmap(HalFile& file, bool dithering = false) : file(file), dithering(dithering) {}
~Bitmap();
BmpReaderError parseHeaders();
BmpReaderError readNextRow(uint8_t* data, uint8_t* rowBuffer) const;
@@ -78,10 +78,10 @@ class Bitmap {
uint16_t getBpp() const { return bpp; }
private:
static uint16_t readLE16(FsFile& f);
static uint32_t readLE32(FsFile& f);
static uint16_t readLE16(HalFile& f);
static uint32_t readLE32(HalFile& f);
FsFile& file;
HalFile& file;
bool dithering = false;
int width = 0;
int height = 0;