Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stick the commented out Indexed8 code in there, for posterity's sake (in

Browse Source 
preparation of a squash)
This commit is contained in:
NiLuJe 2019-05-24 19:48:00 +02:00
parent d2772a2916
commit 227b5f97bd
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/calibre/utils/imageops/ordered_dither.cpp
View File

@ -25,6 +25,9 @@ typedef unsigned __int32 uint32_t;
#include <cstdint> #include <cstdint>
#endif #endif
// Only needed for the (commented out) Indexed8 codepath
//#include <QVector>
// NOTE: *May* not behave any better than a simple / 0xFF on modern x86_64 CPUs... // NOTE: *May* not behave any better than a simple / 0xFF on modern x86_64 CPUs...
// This was, however, tested on ARM, where it is noticeably faster. // This was, however, tested on ARM, where it is noticeably faster.
static uint32_t DIV255(uint32_t v) { static uint32_t DIV255(uint32_t v) {
@ -82,6 +85,22 @@ QImage ordered_dither(const QImage &image) { // {{{
// NOTE: We went with Grayscale8 because QImageWriter was doing some weird things with an Indexed8 input... // NOTE: We went with Grayscale8 because QImageWriter was doing some weird things with an Indexed8 input...
QImage dst(width, height, QImage::Format_Grayscale8); QImage dst(width, height, QImage::Format_Grayscale8);
/*
QImage dst(width, height, QImage::Format_Indexed8);
// Set up the eInk palette
// FIXME: Make it const and switch to C++11 list init if MSVC is amenable...
QVector<uint8_t> palette(16);
QVector<QRgb> color_table(16);
int i = 0;
for (i = 0; i < 16; i++) {
uint8_t color = i * 17;
palette << color;
color_table << qRgb(color, color, color);
}
dst.setColorTable(color_table);
*/
// We're running behind blend_image, so, we should only ever be fed RGB32 as input... // We're running behind blend_image, so, we should only ever be fed RGB32 as input...
if (img.format() != QImage::Format_RGB32) { if (img.format() != QImage::Format_RGB32) {
img = img.convertToFormat(QImage::Format_RGB32); img = img.convertToFormat(QImage::Format_RGB32);
@ -96,7 +115,7 @@ QImage ordered_dither(const QImage &image) { // {{{
// We're running behind grayscale_image, so R = G = B // We're running behind grayscale_image, so R = G = B
gray = qRed(pixel); gray = qRed(pixel);
dithered = dither_o8x8(x, y, gray); dithered = dither_o8x8(x, y, gray);
*(dst_row + x) = dithered; *(dst_row + x) = dithered; // ... or palette.indexOf(dithered); for Indexed8
} }
} }
return dst; return dst;