0165fab581
1. Refactor Bitmap.cpp/h to expose the options for FloydSteinberg and brightness/gamma correction at runtime 2. Fine-tune the thresholds for Floyd Steiberg and simple quantization to better match the display's colors Turns out that 2 is enough to make the images render properly, so the brightness boost and gamma adjustment doesn't seem necessary currently (at least for my test image).
68 lines
1.5 KiB
C++
68 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include <SdFat.h>
|
|
|
|
#include <cstdint>
|
|
|
|
#include "BitmapHelpers.h"
|
|
|
|
enum class BmpReaderError : uint8_t {
|
|
Ok = 0,
|
|
FileInvalid,
|
|
SeekStartFailed,
|
|
|
|
NotBMP,
|
|
DIBTooSmall,
|
|
|
|
BadPlanes,
|
|
UnsupportedBpp,
|
|
UnsupportedCompression,
|
|
|
|
BadDimensions,
|
|
ImageTooLarge,
|
|
PaletteTooLarge,
|
|
|
|
SeekPixelDataFailed,
|
|
BufferTooSmall,
|
|
OomRowBuffer,
|
|
ShortReadRow,
|
|
};
|
|
|
|
class Bitmap {
|
|
public:
|
|
static const char* errorToString(BmpReaderError err);
|
|
|
|
explicit Bitmap(FsFile& file, bool dithering = false) : file(file), dithering(dithering) {}
|
|
~Bitmap();
|
|
BmpReaderError parseHeaders();
|
|
BmpReaderError readNextRow(uint8_t* data, uint8_t* rowBuffer) const;
|
|
BmpReaderError rewindToData() const;
|
|
int getWidth() const { return width; }
|
|
int getHeight() const { return height; }
|
|
bool isTopDown() const { return topDown; }
|
|
bool hasGreyscale() const { return bpp > 1; }
|
|
int getRowBytes() const { return rowBytes; }
|
|
|
|
private:
|
|
static uint16_t readLE16(FsFile& f);
|
|
static uint32_t readLE32(FsFile& f);
|
|
|
|
FsFile& file;
|
|
bool dithering = false;
|
|
int width = 0;
|
|
int height = 0;
|
|
bool topDown = false;
|
|
uint32_t bfOffBits = 0;
|
|
uint16_t bpp = 0;
|
|
int rowBytes = 0;
|
|
uint8_t paletteLum[256] = {};
|
|
|
|
// Floyd-Steinberg dithering state (mutable for const methods)
|
|
mutable int16_t* errorCurRow = nullptr;
|
|
mutable int16_t* errorNextRow = nullptr;
|
|
mutable int prevRowY = -1; // Track row progression for error propagation
|
|
|
|
mutable AtkinsonDitherer* atkinsonDitherer = nullptr;
|
|
mutable FloydSteinbergDitherer* fsDitherer = nullptr;
|
|
};
|