32 lines
1.5 KiB
Markdown
32 lines
1.5 KiB
Markdown
|
# Merge Assessment & Cherry-pick: master -> mod/master
|
||
|
|
|
||
|
|
## Task
|
||
|
|
Assess and merge new commits from `master` into `mod/master`.
|
||
|
|
|
||
|
|
## Analysis
|
||
|
|
- 19 commits on `master` not on `mod/master`, but 16 were already cherry-picked or manually ported (different hashes, same content)
|
||
|
|
- A full `git merge master` produced 30+ conflicts due to duplicate cherry-picks with different patch IDs
|
||
|
|
- Identified 3 genuinely new commits
|
||
|
|
|
||
|
|
## Changes Made
|
||
|
|
|
||
|
|
### 1. Cherry-pick `97c3314` (#932) - `f21720d`
|
||
|
|
- perf: Skip constructing unnecessary `std::string` in TextBlock.cpp
|
||
|
|
- 1-line change, applied cleanly
|
||
|
|
|
||
|
|
### 2. Cherry-pick `2a32d8a` (#926) - `424e332`
|
||
|
|
- chore: Improve Russian language support
|
||
|
|
- Renamed `russia.yaml` -> `russian.yaml`, updated `i18n.md`, fixed translation strings
|
||
|
|
- Applied cleanly
|
||
|
|
|
||
|
|
### 3. Cherry-pick `0bc6747` (#827) - `61fb11c`
|
||
|
|
- feat: Add PNG cover image support for EPUB books
|
||
|
|
- Added `PngToBmpConverter` library (new files, 858 lines)
|
||
|
|
- Resolved 2 conflicts:
|
||
|
|
- `Epub.cpp`: Discarded incoming JPG/PNG block (used old variable names), added PNG thumbnail support to mod's existing structure using `effectiveCoverImageHref` with case-insensitive checks. Fixed `generateCoverBmp()` PNG block to also use `effectiveCoverImageHref`. Added `.png` to `getCoverCandidates()`.
|
||
|
|
- `ImageToFramebufferDecoder.cpp`: Took upstream `LOG_ERR` version over mod's `Serial.printf`
|
||
|
|
|
||
|
|
## Follow-up Items
|
||
|
|
- Build and test PNG cover rendering on device
|
||
|
|
- `mod/master` is now fully caught up with `master`
|