diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2011-01-26 19:28:02 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2011-01-26 19:28:02 +0100 |
| commit | 0d4a5ee84a933e6652912dfd4228fc6f30c7ad5f (patch) | |
| tree | f92f98185d02a48cd3f28400bd8393638fc97a71 | |
| parent | 6d3d831190d166b369ef4247c3e0095f7773fad2 (diff) | |
Revert "Implement --zoom max (zoom like --bg-max)"
This reverts commit 8f8aef70a5049573864be5caf92304ecbac9f0ea.
| -rw-r--r-- | src/winwidget.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/winwidget.c b/src/winwidget.c index e918cd3..8192700 100644 --- a/src/winwidget.c +++ b/src/winwidget.c @@ -426,7 +426,7 @@ void winwidget_render_image(winwidget winwid, int resize, int alias) smaller = ((winwid->im_w < max_w) && (winwid->im_h < max_h)); - if (!smaller || opt.zoom_mode) { + if (!smaller || (opt.zoom_mode == ZOOM_MODE_FILL)) { double ratio = 0.0; /* Image is larger than the screen (so wants shrinking), or it's @@ -580,9 +580,6 @@ double feh_calc_needed_zoom(double *zoom, int orig_w, int orig_h, int dest_w, in ratio = ((double) orig_w / orig_h) / ((double) dest_w / dest_h); - if (opt.zoom_mode == ZOOM_MODE_MAX) - ratio = 1.0 / ratio; - if (ratio > 1.0) *zoom = ((double) dest_w / orig_w); else |