mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-05 15:17:37 +03:00
chore(clang-format-fix): fixing format
This commit is contained in:
parent
fbda7aa4f1
commit
8fc51668d0
@ -372,8 +372,8 @@ bool Epub::generateThumbBmp() const {
|
|||||||
// Generate 1-bit BMP for fast home screen rendering (no gray passes needed)
|
// Generate 1-bit BMP for fast home screen rendering (no gray passes needed)
|
||||||
constexpr int THUMB_TARGET_WIDTH = 240;
|
constexpr int THUMB_TARGET_WIDTH = 240;
|
||||||
constexpr int THUMB_TARGET_HEIGHT = 400;
|
constexpr int THUMB_TARGET_HEIGHT = 400;
|
||||||
const bool success =
|
const bool success = JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(coverJpg, thumbBmp, THUMB_TARGET_WIDTH,
|
||||||
JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(coverJpg, thumbBmp, THUMB_TARGET_WIDTH, THUMB_TARGET_HEIGHT);
|
THUMB_TARGET_HEIGHT);
|
||||||
coverJpg.close();
|
coverJpg.close();
|
||||||
thumbBmp.close();
|
thumbBmp.close();
|
||||||
SdMan.remove(coverJpgTempPath.c_str());
|
SdMan.remove(coverJpgTempPath.c_str());
|
||||||
|
|||||||
@ -229,7 +229,7 @@ void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, con
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GfxRenderer::drawBitmap1Bit(const Bitmap& bitmap, const int x, const int y, const int maxWidth,
|
void GfxRenderer::drawBitmap1Bit(const Bitmap& bitmap, const int x, const int y, const int maxWidth,
|
||||||
const int maxHeight) const {
|
const int maxHeight) const {
|
||||||
float scale = 1.0f;
|
float scale = 1.0f;
|
||||||
bool isScaled = false;
|
bool isScaled = false;
|
||||||
if (maxWidth > 0 && bitmap.getWidth() > maxWidth) {
|
if (maxWidth > 0 && bitmap.getWidth() > maxWidth) {
|
||||||
|
|||||||
@ -762,7 +762,8 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(FsFile& jpegFile, Print& bm
|
|||||||
// 1-bit output with Atkinson dithering for better quality
|
// 1-bit output with Atkinson dithering for better quality
|
||||||
for (int x = 0; x < outWidth; x++) {
|
for (int x = 0; x < outWidth; x++) {
|
||||||
const uint8_t gray = mcuRowBuffer[bufferY * imageInfo.m_width + x];
|
const uint8_t gray = mcuRowBuffer[bufferY * imageInfo.m_width + x];
|
||||||
const uint8_t bit = atkinson1BitDitherer ? atkinson1BitDitherer->processPixel(gray, x) : quantize1bit(gray, x, y);
|
const uint8_t bit =
|
||||||
|
atkinson1BitDitherer ? atkinson1BitDitherer->processPixel(gray, x) : quantize1bit(gray, x, y);
|
||||||
// Pack 1-bit value: MSB first, 8 pixels per byte
|
// Pack 1-bit value: MSB first, 8 pixels per byte
|
||||||
const int byteIndex = x / 8;
|
const int byteIndex = x / 8;
|
||||||
const int bitOffset = 7 - (x % 8);
|
const int bitOffset = 7 - (x % 8);
|
||||||
@ -837,7 +838,8 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(FsFile& jpegFile, Print& bm
|
|||||||
// 1-bit output with Atkinson dithering for better quality
|
// 1-bit output with Atkinson dithering for better quality
|
||||||
for (int x = 0; x < outWidth; x++) {
|
for (int x = 0; x < outWidth; x++) {
|
||||||
const uint8_t gray = (rowCount[x] > 0) ? (rowAccum[x] / rowCount[x]) : 0;
|
const uint8_t gray = (rowCount[x] > 0) ? (rowAccum[x] / rowCount[x]) : 0;
|
||||||
const uint8_t bit = atkinson1BitDitherer ? atkinson1BitDitherer->processPixel(gray, x) : quantize1bit(gray, x, currentOutY);
|
const uint8_t bit = atkinson1BitDitherer ? atkinson1BitDitherer->processPixel(gray, x)
|
||||||
|
: quantize1bit(gray, x, currentOutY);
|
||||||
// Pack 1-bit value: MSB first, 8 pixels per byte
|
// Pack 1-bit value: MSB first, 8 pixels per byte
|
||||||
const int byteIndex = x / 8;
|
const int byteIndex = x / 8;
|
||||||
const int bitOffset = 7 - (x % 8);
|
const int bitOffset = 7 - (x % 8);
|
||||||
@ -916,6 +918,6 @@ bool JpegToBmpConverter::jpegFileToBmpStreamWithSize(FsFile& jpegFile, Print& bm
|
|||||||
|
|
||||||
// Convert to 1-bit BMP (black and white only, no grays) for fast home screen rendering
|
// Convert to 1-bit BMP (black and white only, no grays) for fast home screen rendering
|
||||||
bool JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(FsFile& jpegFile, Print& bmpOut, int targetMaxWidth,
|
bool JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(FsFile& jpegFile, Print& bmpOut, int targetMaxWidth,
|
||||||
int targetMaxHeight) {
|
int targetMaxHeight) {
|
||||||
return jpegFileToBmpStreamInternal(jpegFile, bmpOut, targetMaxWidth, targetMaxHeight, true);
|
return jpegFileToBmpStreamInternal(jpegFile, bmpOut, targetMaxWidth, targetMaxHeight, true);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -522,7 +522,7 @@ bool Xtc::generateThumbBmp() const {
|
|||||||
// Hash-based noise dithering for 1-bit output
|
// Hash-based noise dithering for 1-bit output
|
||||||
uint32_t hash = static_cast<uint32_t>(dstX) * 374761393u + static_cast<uint32_t>(dstY) * 668265263u;
|
uint32_t hash = static_cast<uint32_t>(dstX) * 374761393u + static_cast<uint32_t>(dstY) * 668265263u;
|
||||||
hash = (hash ^ (hash >> 13)) * 1274126177u;
|
hash = (hash ^ (hash >> 13)) * 1274126177u;
|
||||||
const int threshold = static_cast<int>(hash >> 24); // 0-255
|
const int threshold = static_cast<int>(hash >> 24); // 0-255
|
||||||
const int adjustedThreshold = 128 + ((threshold - 128) / 2); // Range: 64-192
|
const int adjustedThreshold = 128 + ((threshold - 128) / 2); // Range: 64-192
|
||||||
|
|
||||||
// Quantize to 1-bit: 0=black, 1=white
|
// Quantize to 1-bit: 0=black, 1=white
|
||||||
@ -534,7 +534,7 @@ bool Xtc::generateThumbBmp() const {
|
|||||||
// Bounds check for row buffer access
|
// Bounds check for row buffer access
|
||||||
if (byteIndex < rowSize) {
|
if (byteIndex < rowSize) {
|
||||||
if (oneBit) {
|
if (oneBit) {
|
||||||
rowBuffer[byteIndex] |= (1 << bitOffset); // Set bit for white
|
rowBuffer[byteIndex] |= (1 << bitOffset); // Set bit for white
|
||||||
} else {
|
} else {
|
||||||
rowBuffer[byteIndex] &= ~(1 << bitOffset); // Clear bit for black
|
rowBuffer[byteIndex] &= ~(1 << bitOffset); // Clear bit for black
|
||||||
}
|
}
|
||||||
|
|||||||
@ -257,18 +257,18 @@ void HomeActivity::render() {
|
|||||||
const int centerX = bookmarkX + bookmarkWidth / 2;
|
const int centerX = bookmarkX + bookmarkWidth / 2;
|
||||||
|
|
||||||
const int xPoints[5] = {
|
const int xPoints[5] = {
|
||||||
bookmarkX, // top-left
|
bookmarkX, // top-left
|
||||||
bookmarkX + bookmarkWidth, // top-right
|
bookmarkX + bookmarkWidth, // top-right
|
||||||
bookmarkX + bookmarkWidth, // bottom-right
|
bookmarkX + bookmarkWidth, // bottom-right
|
||||||
centerX, // center notch point
|
centerX, // center notch point
|
||||||
bookmarkX // bottom-left
|
bookmarkX // bottom-left
|
||||||
};
|
};
|
||||||
const int yPoints[5] = {
|
const int yPoints[5] = {
|
||||||
bookmarkY, // top-left
|
bookmarkY, // top-left
|
||||||
bookmarkY, // top-right
|
bookmarkY, // top-right
|
||||||
bookmarkY + bookmarkHeight, // bottom-right
|
bookmarkY + bookmarkHeight, // bottom-right
|
||||||
bookmarkY + bookmarkHeight - notchDepth, // center notch point
|
bookmarkY + bookmarkHeight - notchDepth, // center notch point
|
||||||
bookmarkY + bookmarkHeight // bottom-left
|
bookmarkY + bookmarkHeight // bottom-left
|
||||||
};
|
};
|
||||||
|
|
||||||
// Draw bookmark ribbon (white normally, will be inverted if selected)
|
// Draw bookmark ribbon (white normally, will be inverted if selected)
|
||||||
@ -308,18 +308,18 @@ void HomeActivity::render() {
|
|||||||
const int centerX = bookmarkX + bookmarkWidth / 2;
|
const int centerX = bookmarkX + bookmarkWidth / 2;
|
||||||
|
|
||||||
const int xPoints[5] = {
|
const int xPoints[5] = {
|
||||||
bookmarkX, // top-left
|
bookmarkX, // top-left
|
||||||
bookmarkX + bookmarkWidth, // top-right
|
bookmarkX + bookmarkWidth, // top-right
|
||||||
bookmarkX + bookmarkWidth, // bottom-right
|
bookmarkX + bookmarkWidth, // bottom-right
|
||||||
centerX, // center notch point
|
centerX, // center notch point
|
||||||
bookmarkX // bottom-left
|
bookmarkX // bottom-left
|
||||||
};
|
};
|
||||||
const int yPoints[5] = {
|
const int yPoints[5] = {
|
||||||
bookmarkY, // top-left
|
bookmarkY, // top-left
|
||||||
bookmarkY, // top-right
|
bookmarkY, // top-right
|
||||||
bookmarkY + bookmarkHeight, // bottom-right
|
bookmarkY + bookmarkHeight, // bottom-right
|
||||||
bookmarkY + bookmarkHeight - notchDepth, // center notch point
|
bookmarkY + bookmarkHeight - notchDepth, // center notch point
|
||||||
bookmarkY + bookmarkHeight // bottom-left
|
bookmarkY + bookmarkHeight // bottom-left
|
||||||
};
|
};
|
||||||
|
|
||||||
// Draw black filled bookmark ribbon (inverted)
|
// Draw black filled bookmark ribbon (inverted)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user