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

Minor fixes

Browse Source
This commit is contained in:
jpirnay
2026-04-07 23:28:51 +02:00
parent e035d698ed
commit 7168c46dec
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Epub/Epub/converters/PngToFramebufferConverter.cpp
+2
View File
@@ -502,6 +502,8 @@ bool PngToFramebufferConverter::decodeToFramebuffer(const std::string& imagePath
// the 2-bit cache file format, but caching is disabled in this path // the 2-bit cache file format, but caching is disabled in this path
// (BmpViewerActivity passes an empty cachePath). // (BmpViewerActivity passes an empty cachePath).
ctx.renderModeIsBW = (renderer.getRenderMode() == GfxRenderer::BW); ctx.renderModeIsBW = (renderer.getRenderMode() == GfxRenderer::BW);
LOG_DBG("PNG", "Render mode at decode: %d (BW=%d) -> 1bit dither=%d", (int)renderer.getRenderMode(),
(int)GfxRenderer::BW, ctx.renderModeIsBW ? 1 : 0);
if (ctx.renderModeIsBW) { if (ctx.renderModeIsBW) {
ctx.atkinson1BitDitherer = new (std::nothrow) Atkinson1BitDitherer(ctx.dstWidth); ctx.atkinson1BitDitherer = new (std::nothrow) Atkinson1BitDitherer(ctx.dstWidth);
if (!ctx.atkinson1BitDitherer) { if (!ctx.atkinson1BitDitherer) {
src/activities/boot_sleep/SleepActivity.cpp
+4 -2
View File
@@ -9,6 +9,7 @@
#include <Serialization.h> #include <Serialization.h>
#include <Txt.h> #include <Txt.h>
#include <Xtc.h> #include <Xtc.h>
#include <esp_system.h>
#include <algorithm> #include <algorithm>
#include <new> #include <new>
@@ -22,6 +23,7 @@
#include "fontIds.h" #include "fontIds.h"
#include "images/Logo120.h" #include "images/Logo120.h"
namespace { namespace {
// Context passed through PNGdec's decode() user-pointer to the per-scanline draw callback. // Context passed through PNGdec's decode() user-pointer to the per-scanline draw callback.
@@ -216,9 +218,9 @@ size_t pickSleepImageIndex(size_t numFiles) {
if (last == SIZE_MAX || last >= numFiles) return 0; if (last == SIZE_MAX || last >= numFiles) return 0;
return (last + 1) % numFiles; return (last + 1) % numFiles;
} }
size_t idx = random(numFiles); size_t idx = static_cast<size_t>(esp_random() % numFiles);
while (numFiles > 1 && APP_STATE.lastSleepImage != SIZE_MAX && idx == APP_STATE.lastSleepImage) { while (numFiles > 1 && APP_STATE.lastSleepImage != SIZE_MAX && idx == APP_STATE.lastSleepImage) {
idx = random(numFiles); idx = static_cast<size_t>(esp_random() % numFiles);
} }
return idx; return idx;
} }