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

cpp: don't emit duplicate color codes

Browse source 
Closes: https://github.com/stefanhaustein/TerminalImageViewer/issues/54
This commit is contained in:
Jan Chren (rindeal) 2019-10-19 01:38:03 +02:00 committed by Stefan Haustein
parent 4743f30485
commit 1de00052a1
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/cpp/tiv.cpp
View file

@ -4,6 +4,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
#include <array>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <experimental/filesystem> #include <experimental/filesystem>
@ -122,8 +123,8 @@ const unsigned int BITMAPS[] = {
struct CharData { struct CharData {
int fgColor[3] = {0}; std::array<int, 3> fgColor = {0};
int bgColor[3] = {0}; std::array<int, 3> bgColor = {0};
int codePoint; int codePoint;
}; };
@ -140,11 +141,11 @@ CharData getCharData(const cimg_library::CImg<unsigned char> & image, int x0, in
for (int x = 0; x < 4; x++) { for (int x = 0; x < 4; x++) {
int* avg; int* avg;
if (pattern & mask) { if (pattern & mask) {
avg = result.fgColor; avg = result.fgColor.data();
fg_count++; fg_count++;
} else { } else {
avg = result.bgColor; avg = result.bgColor.data();
bg_count++; bg_count++;
} }
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
avg[i] += image(x0 + x, y0 + y, 0, i); avg[i] += image(x0 + x, y0 + y, 0, i);
@ -369,17 +370,21 @@ void emitCodepoint(int codepoint) {
void emit_image(const cimg_library::CImg<unsigned char> & image, int flags) { void emit_image(const cimg_library::CImg<unsigned char> & image, int flags) {
for (int y = 0; y <= image.height() - 8; y += 8) { CharData lastCharData;
for (int x = 0; x <= image.width() - 4; x += 4) { for (int y = 0; y <= image.height() - 8; y += 8) {
CharData charData = flags & FLAG_NOOPT for (int x = 0; x <= image.width() - 4; x += 4) {
? getCharData(image, x, y, 0x2584, 0x0000ffff) CharData charData = flags & FLAG_NOOPT
: getCharData(image, x, y); ? getCharData(image, x, y, 0x2584, 0x0000ffff)
: getCharData(image, x, y);
if (charData.bgColor != lastCharData.bgColor)
emit_color(flags | FLAG_BG, charData.bgColor[0], charData.bgColor[1], charData.bgColor[2]); emit_color(flags | FLAG_BG, charData.bgColor[0], charData.bgColor[1], charData.bgColor[2]);
if (charData.fgColor != lastCharData.fgColor)
emit_color(flags | FLAG_FG, charData.fgColor[0], charData.fgColor[1], charData.fgColor[2]); emit_color(flags | FLAG_FG, charData.fgColor[0], charData.fgColor[1], charData.fgColor[2]);
emitCodepoint(charData.codePoint); emitCodepoint(charData.codePoint);
} lastCharData = charData;
std::cout << "\x1b[0m" << std::endl;
} }
std::cout << "\x1b[0m" << std::endl;
}
} }