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

output redirection and color calculation fixes; minor improvements

Browse source 
fix: no longer accessing unexisting element of color_per_count;
fix: improved redirection handing;
fix: don't print empty rows in thumbs mode.
This commit is contained in:
crouvpony47 2019-05-18 01:27:06 +03:00 committed by Stefan Haustein
parent 53dff6f5b9
commit bbc34345a1
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -195,8 +195,7 @@ CharData getCharData(const cimg_library::CImg<unsigned char> & image, int x0, in
int count2 = iter->first; int count2 = iter->first;
long max_count_color_1 = iter->second; long max_count_color_1 = iter->second;
long max_count_color_2 = max_count_color_1; long max_count_color_2 = max_count_color_1;
if (iter != color_per_count.rend()) { if ((++iter) != color_per_count.rend()) {
++iter;
count2 += iter->first; count2 += iter->first;
max_count_color_2 = iter->second; max_count_color_2 = iter->second;
} }
@ -330,7 +329,7 @@ void emit_color(int flags, int r, int g, int b) {
int gq = COLOR_STEPS[gi]; int gq = COLOR_STEPS[gi];
int bq = COLOR_STEPS[bi]; int bq = COLOR_STEPS[bi];
int gray = std::round(r * 0.2989f + g * 0.5870f + b * 0.1140f); int gray = static_cast<int>(std::round(r * 0.2989f + g * 0.5870f + b * 0.1140f));
int gri = best_index(gray, GRAYSCALE_STEPS, GRAYSCALE_STEP_COUNT); int gri = best_index(gray, GRAYSCALE_STEPS, GRAYSCALE_STEP_COUNT);
int grq = GRAYSCALE_STEPS[gri]; int grq = GRAYSCALE_STEPS[gri];
@ -440,16 +439,24 @@ cimg_library::CImg<unsigned char> load_rgb_CImg(const char * const filename) {
} }
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
int maxWidth = 80;
int maxHeight = 24;
bool sizeDetectionSuccessful = true;
struct winsize w; struct winsize w;
ioctl(STDOUT_FILENO, TIOCGWINSZ, &w); int ioStatus = ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
// If redirecting STDOUT to one file ( col or row == 0, or the previous ioctl call's failed )
//If redirect STDOUT to one file ( col and row == 0 ) if (ioStatus != 0 || (w.ws_col | w.ws_row) == 0) {
if(w.ws_col == 0 && w.ws_row == 0) { ioStatus = ioctl(STDIN_FILENO, TIOCGWINSZ, &w);
ioctl(0, TIOCGWINSZ, &w); if (ioStatus != 0 || (w.ws_col | w.ws_row) == 0) {
std::cerr << "Warning: failed to determine most reasonable size, defaulting to 80x24" << std::endl;
sizeDetectionSuccessful = false;
}
}
if (sizeDetectionSuccessful)
{
maxWidth = w.ws_col * 4;
maxHeight = w.ws_row * 8;
} }
int maxWidth = w.ws_col * 4;
int maxHeight = w.ws_row * 8;
int flags = 0; int flags = 0;
Mode mode = AUTO; Mode mode = AUTO;
int columns = 3; int columns = 3;
@ -528,7 +535,7 @@ int main(int argc, char* argv[]) {
std::string name = file_names[index++]; std::string name = file_names[index++];
try { try {
cimg_library::CImg<unsigned char> original = load_rgb_CImg(name.c_str()); cimg_library::CImg<unsigned char> original = load_rgb_CImg(name.c_str());
unsigned int cut = name.find_last_of("/"); auto cut = name.find_last_of("/");
sb += cut == std::string::npos ? name : name.substr(cut + 1); sb += cut == std::string::npos ? name : name.substr(cut + 1);
size newSize = size(original).fitted_within(maxThumbSize); size newSize = size(original).fitted_within(maxThumbSize);
original.resize(newSize.width, newSize.height, 1, -100, 5); original.resize(newSize.width, newSize.height, 1, -100, 5);
@ -541,7 +548,7 @@ int main(int argc, char* argv[]) {
// Probably no image; ignore. // Probably no image; ignore.
} }
} }
emit_image(image, flags); if (count) emit_image(image, flags);
std::cout << sb << std::endl << std::endl; std::cout << sb << std::endl << std::endl;
} }
} }