simono41/TerminalImageViewer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change getPixel to actually transfer a full pixel with all channels

Browse source
This commit is contained in:
Stefan Haustein 2024-02-21 20:34:43 +01:00
parent 4cb242b7f5
commit 2fa6ece556
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/tiv.cpp
View file

@ -126,9 +126,10 @@ void printCodepoint(int codepoint) {
void printImage(const cimg_library::CImg<unsigned char> &image, void printImage(const cimg_library::CImg<unsigned char> &image,
const int &flags) { const int &flags) {
GetPixelFunction get_pixel = [&](int x, int y, GetPixelFunction get_pixel = [&](int x, int y) -> unsigned long {
int channel) -> unsigned char { return (((unsigned long) image(x, y, 0, 0)) << 16)
return image(x, y, 0, channel); | (((unsigned long) image(x, y, 0, 1)) << 8)
| (((unsigned long) image(x, y, 0, 2)));
}; };
CharData lastCharData; CharData lastCharData;

15
src/tiv_lib.cpp
View file

@ -167,6 +167,10 @@ constexpr unsigned int BITMAPS[] = {
0, 1 // End marker for extended TELETEXT mode. 0, 1 // End marker for extended TELETEXT mode.
}; };
// The channel indices are 0, 1, 2 for R, G, B
unsigned char get_channel(unsigned long rgb, int index) {
return (unsigned char) ((rgb >> ((2 - index) * 8)) & 255);
}
CharData createCharData(GetPixelFunction get_pixel, int x0, int y0, CharData createCharData(GetPixelFunction get_pixel, int x0, int y0,
int codepoint, int pattern) { int codepoint, int pattern) {
@ -186,8 +190,9 @@ CharData createCharData(GetPixelFunction get_pixel, int x0, int y0,
avg = result.bgColor.data(); avg = result.bgColor.data();
bg_count++; bg_count++;
} }
long rgb = get_pixel(x0 + x, y0 + y);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
avg[i] += get_pixel(x0 + x, y0 + y, i); avg[i] += get_channel(rgb, i);
} }
mask = mask >> 1; mask = mask >> 1;
} }
@ -215,8 +220,9 @@ CharData findCharData(GetPixelFunction get_pixel, int x0, int y0,
for (int y = 0; y < 8; y++) { for (int y = 0; y < 8; y++) {
for (int x = 0; x < 4; x++) { for (int x = 0; x < 4; x++) {
long color = 0; long color = 0;
long rgb = get_pixel(x0 + x, y0 + y);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
int d = get_pixel(x0 + x, y0 + y, i); int d = get_channel(rgb, i);
min[i] = std::min(min[i], d); min[i] = std::min(min[i], d);
max[i] = std::max(max[i], d); max[i] = std::max(max[i], d);
color = (color << 8) | d; color = (color << 8) | d;
@ -248,11 +254,12 @@ CharData findCharData(GetPixelFunction get_pixel, int x0, int y0,
bits = bits << 1; bits = bits << 1;
int d1 = 0; int d1 = 0;
int d2 = 0; int d2 = 0;
unsigned long rgb = get_pixel(x0 + x, y0 + y);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
int shift = 16 - 8 * i; int shift = 16 - 8 * i;
int c1 = (max_count_color_1 >> shift) & 255; int c1 = (max_count_color_1 >> shift) & 255;
int c2 = (max_count_color_2 >> shift) & 255; int c2 = (max_count_color_2 >> shift) & 255;
int c = get_pixel(x0 + x, y0 + y, i); int c = get_channel(rgb, i);
d1 += (c1 - c) * (c1 - c); d1 += (c1 - c) * (c1 - c);
d2 += (c2 - c) * (c2 - c); d2 += (c2 - c) * (c2 - c);
} }
@ -281,7 +288,7 @@ CharData findCharData(GetPixelFunction get_pixel, int x0, int y0,
for (int y = 0; y < 8; y++) { for (int y = 0; y < 8; y++) {
for (int x = 0; x < 4; x++) { for (int x = 0; x < 4; x++) {
bits = bits << 1; bits = bits << 1;
if (get_pixel(x0 + x, y0 + y, splitIndex) > splitValue) { if (get_channel(get_pixel(x0 + x, y0 + y), splitIndex) > splitValue) {
bits |= 1; bits |= 1;
} }
} }

2
src/tiv_lib.h
View file

@ -58,7 +58,7 @@ constexpr int GRAYSCALE_STEPS[GRAYSCALE_STEP_COUNT] = {
0x80, 0x8a, 0x94, 0x9e, 0xa8, 0xb2, 0xbc, 0xc6, 0xd0, 0xda, 0xe4, 0xee}; 0x80, 0x8a, 0x94, 0x9e, 0xa8, 0xb2, 0xbc, 0xc6, 0xd0, 0xda, 0xe4, 0xee};
typedef std::function<unsigned char(int, int, int)> GetPixelFunction; typedef std::function<unsigned long(int, int)> GetPixelFunction;
int clamp_byte(int value); int clamp_byte(int value);