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

cleanup / formatting

Browse source
This commit is contained in:
Stefan Haustein 2024-03-06 18:51:31 +01:00
parent 917b381bc3
commit 8aca9afaf7
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/tiv_lib.cpp
View file

@ -48,10 +48,10 @@ const int END_MARKER = 0;
// An interleaved map of 4x8 bit character bitmaps (each hex digit represents a // An interleaved map of 4x8 bit character bitmaps (each hex digit represents a
// row) to the corresponding unicode character code point. // row) to the corresponding unicode character code point.
constexpr unsigned int BITMAPS[] = { constexpr unsigned int BITMAPS[] = {
0x00000000, 0x00a0, 0x00000000, 0x00a0, 0,
// Block graphics // Block graphics
// 0xffff0000, 0x2580, // upper 1/2; redundant with inverse lower 1/2 // 0xffff0000, 0x2580, 0, // upper 1/2; redundant with inverse lower 1/2
0x0000000f, 0x2581, 0, // lower 1/8 0x0000000f, 0x2581, 0, // lower 1/8
0x000000ff, 0x2582, 0, // lower 1/4 0x000000ff, 0x2582, 0, // lower 1/4
@ -103,7 +103,7 @@ constexpr unsigned int BITMAPS[] = {
0x000f0000, 0x2500, 0, // Light horizontal 0x000f0000, 0x2500, 0, // Light horizontal
0x0000f000, 0x2500, 0, // 0x0000f000, 0x2500, 0, //
0x44444444, 0x2502, 0, // Light vertical 0x44444444, 0x2502, 0, // Light vertical
0x22222222, 0x2502, 0x22222222, 0x2502, 0,
0x000e0000, 0x2574, 0, // light left 0x000e0000, 0x2574, 0, // light left
0x0000e000, 0x2574, 0, // light left 0x0000e000, 0x2574, 0, // light left
@ -342,9 +342,8 @@ CharData findCharData(GetPixelFunction get_pixel, int x0, int y0,
unsigned int best_pattern = 0x0000ffff; unsigned int best_pattern = 0x0000ffff;
int codepoint = 0x2584; int codepoint = 0x2584;
bool inverted = false; bool inverted = false;
for (int i = 0; BITMAPS[i + 1] != 0; i += 3) { for (int i = 0; BITMAPS[i + 1] != END_MARKER; i += 3) {
// Skip all end markers if ((BITMAPS[i + 2] & flags) != BITMAPS[i + 2]) {
if (BITMAPS[i + 2] & flags != BITMAPS[i + 2]) {
continue; continue;
} }
unsigned int pattern = BITMAPS[i]; unsigned int pattern = BITMAPS[i];