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

Cleanup to match upstream style.

Browse source
This commit is contained in:
Alan De Smet 2019-03-23 14:31:39 -05:00 committed by Stefan Haustein
parent f97c6e9eb0
commit 419056506f
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -392,9 +392,13 @@ struct size {
} }
unsigned int width; unsigned int width;
unsigned int height; unsigned int height;
size operator*(double scale) { size scaled(double scale) {
return size(width*scale, height*scale); return size(width*scale, height*scale);
} }
size fitted_within(size container) {
double scale = std::min(container.width / (double) width, container.height / (double) height);
return scaled(scale);
}
}; };
std::ostream& operator<<(std::ostream& stream, size sz) { std::ostream& operator<<(std::ostream& stream, size sz) {
stream << sz.width << "x" << sz.height; stream << sz.width << "x" << sz.height;
@ -402,10 +406,6 @@ std::ostream& operator<<(std::ostream& stream, size sz) {
} }
size fit_within(size container, size object) {
double scale = std::min(container.width / (double) object.width, container.height / (double) object.height);
return object * scale;
}
void emit_usage() { void emit_usage() {
@ -510,7 +510,7 @@ int main(int argc, char* argv[]) {
cimg_library::CImg<unsigned char> image = load_rgb_CImg(file_names[i].c_str()); cimg_library::CImg<unsigned char> image = load_rgb_CImg(file_names[i].c_str());
if (image.width() > maxWidth || image.height() > maxHeight) { if (image.width() > maxWidth || image.height() > maxHeight) {
size new_size = fit_within(size(maxWidth,maxHeight), size(image)); size new_size = size(image).fitted_within(size(maxWidth,maxHeight));
image.resize(new_size.width, new_size.height, -100, -100, 5); image.resize(new_size.width, new_size.height, -100, -100, 5);
} }
emit_image(image, flags); emit_image(image, flags);
@ -538,7 +538,7 @@ int main(int argc, char* argv[]) {
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("/"); unsigned int 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 = fit_within(maxThumbSize, size(original)); 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);
image.draw_image(count * (tw + 8) + (tw - newSize.width) / 2, (tw - newSize.height) / 2, 0, 0, original); image.draw_image(count * (tw + 8) + (tw - newSize.width) / 2, (tw - newSize.height) / 2, 0, 0, original);
count++; count++;