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

make positioning of flags in emitTermColor consistent with other funcs

Browse source
This commit is contained in:
Aaron Liu 2024-02-01 18:13:31 -05:00
parent f51dc08b0a
commit 7b3c8286fe
No known key found for this signature in database
GPG key ID: 2D4DA57B12065A35
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/tiv.cpp
View file

@ -422,7 +422,7 @@ int best_index(int value, const int STEPS[], int count) {
return result; return result;
} }
std::string emitTermColor(const int8_t &flags, int r, int g, int b) { std::string emitTermColor(int r, int g, int b, const int8_t &flags) {
r = clamp_byte(r), g = clamp_byte(g), b = clamp_byte(b); r = clamp_byte(r), g = clamp_byte(g), b = clamp_byte(b);
const bool bg = (flags & FLAG_BG); const bool bg = (flags & FLAG_BG);
@ -480,7 +480,7 @@ void emitCodepoint(int codepoint) {
} }
std::string emitImage(const cimg_library::CImg<unsigned char> &image, std::string emitImage(const cimg_library::CImg<unsigned char> &image,
const int8_t &flags) { const int8_t &flags) {
std::string ret; std::string ret;
CharData lastCharData; CharData lastCharData;
for (int y = 0; y <= image.height() - 8; y += 8) { for (int y = 0; y <= image.height() - 8; y += 8) {
@ -492,11 +492,11 @@ std::string emitImage(const cimg_library::CImg<unsigned char> &image,
? createCharData(image, x, y, 0x2584, 0x0000ffff) ? createCharData(image, x, y, 0x2584, 0x0000ffff)
: findCharData(image, x, y, flags); : findCharData(image, x, y, flags);
if (x == 0 || charData.bgColor != lastCharData.bgColor) if (x == 0 || charData.bgColor != lastCharData.bgColor)
ret += emitTermColor(flags | FLAG_BG, charData.bgColor[0], ret += emitTermColor(charData.bgColor[0], charData.bgColor[1],
charData.bgColor[1], charData.bgColor[2]); charData.bgColor[2], flags | FLAG_BG);
if (x == 0 || charData.fgColor != lastCharData.fgColor) if (x == 0 || charData.fgColor != lastCharData.fgColor)
ret += emitTermColor(flags | FLAG_FG, charData.fgColor[0], ret += emitTermColor(charData.fgColor[0], charData.fgColor[1],
charData.fgColor[1], charData.fgColor[2]); charData.fgColor[2], flags | FLAG_FG);
ret += (charData.codePoint); ret += (charData.codePoint);
lastCharData = charData; lastCharData = charData;
} }
@ -551,10 +551,12 @@ void printImage(const cimg_library::CImg<unsigned char> &image,
: findCharData(image, x, y, flags); : findCharData(image, x, y, flags);
if (x == 0 || charData.bgColor != lastCharData.bgColor) if (x == 0 || charData.bgColor != lastCharData.bgColor)
std::cout << emitTermColor(flags | FLAG_BG, charData.bgColor[0], std::cout << emitTermColor(flags | FLAG_BG, charData.bgColor[0],
charData.bgColor[1], charData.bgColor[2]); charData.bgColor[1],
charData.bgColor[2]);
if (x == 0 || charData.fgColor != lastCharData.fgColor) if (x == 0 || charData.fgColor != lastCharData.fgColor)
std::cout << emitTermColor(flags | FLAG_FG, charData.fgColor[0], std::cout << emitTermColor(flags | FLAG_FG, charData.fgColor[0],
charData.fgColor[1], charData.fgColor[2]); charData.fgColor[1],
charData.fgColor[2]);
printCodepoint(charData.codePoint); printCodepoint(charData.codePoint);
lastCharData = charData; lastCharData = charData;
} }