Eunchurn Park b5d92e71f7 Merge upstream/master into feature/continue-reading-cover ... Resolved merge conflicts: - lib/Epub/Epub.h: Kept both upstream's cropped parameter and HEAD's thumb functions - lib/JpegToBmpConverter/JpegToBmpConverter.cpp: Used upstream's version (dithering code moved to BitmapHelpers) - src/activities/home/HomeActivity.cpp: Kept HEAD's comment about stack size Added missing 1-bit dithering support to BitmapHelpers: - Added Atkinson1BitDitherer class to BitmapHelpers.h - Added quantize1bit() function to BitmapHelpers.cpp		2026-01-14 02:24:36 +09:00
..
Bitmap.cpp	Merge upstream/master into feature/continue-reading-cover	2026-01-14 02:24:36 +09:00
Bitmap.h	Merge upstream/master into feature/continue-reading-cover	2026-01-14 02:24:36 +09:00
BitmapHelpers.cpp	Merge upstream/master into feature/continue-reading-cover	2026-01-14 02:24:36 +09:00
BitmapHelpers.h	Merge upstream/master into feature/continue-reading-cover	2026-01-14 02:24:36 +09:00
GfxRenderer.cpp	Merge upstream/master into feature/continue-reading-cover	2026-01-09 23:57:38 +09:00
GfxRenderer.h	Merge upstream/master into feature/continue-reading-cover	2026-01-09 23:57:38 +09:00