bob/termage
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix uneven row count

Browse Source
This commit is contained in:
Bob Polis 2024-01-28 23:19:41 +01:00
parent 0eaf0973d9
commit 84e3e669e3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pixels.cpp
View File

@ -16,17 +16,24 @@ static void write(std::ostream& os, FILE* in) {
std::unique_ptr<tuple, void(*)(void*)> row1 {pnm_allocpamrow(&info), pm_freerow}; std::unique_ptr<tuple, void(*)(void*)> row1 {pnm_allocpamrow(&info), pm_freerow};
std::unique_ptr<tuple, void(*)(void*)> row2 {pnm_allocpamrow(&info), pm_freerow}; std::unique_ptr<tuple, void(*)(void*)> row2 {pnm_allocpamrow(&info), pm_freerow};
for (int y = 0; y < info.height; y += 2) { for (int y = 0; y < info.height; y += 2) {
tuple* t1 {row1.get()};
tuple* t2 {row2.get()};
pnm_readpamrow(&info, row1.get()); pnm_readpamrow(&info, row1.get());
pnm_readpamrow(&info, row2.get()); if (y < info.height - 1) {
pnm_readpamrow(&info, row2.get());
} else {
// fill second row with terminal background color
for (int col = 0; col < info.width; ++col) {
t2[col][0] = t2[col][1] = t2[col][2] = 0;
}
}
for (int x = 0; x < info.width; ++x) { for (int x = 0; x < info.width; ++x) {
if (info.depth == 3) { // assume RGB, 1 byte per sample if (info.depth == 3) { // assume RGB, 1 byte per sample
tuple* t1 {row1.get()};
if (has_truecolor) { if (has_truecolor) {
os << sc::io::truecolorb(t1[x][0], t1[x][1], t1[x][2]); os << sc::io::truecolorb(t1[x][0], t1[x][1], t1[x][2]);
} else { } else {
os << sc::io::rgbb(t2p(t1[x][0]), t2p(t1[x][1]), t2p(t1[x][2])); os << sc::io::rgbb(t2p(t1[x][0]), t2p(t1[x][1]), t2p(t1[x][2]));
} }
tuple* t2 {row2.get()};
if (has_truecolor) { if (has_truecolor) {
os << sc::io::truecolorf(t2[x][0], t2[x][1], t2[x][2]); os << sc::io::truecolorf(t2[x][0], t2[x][1], t2[x][2]);
} else { } else {