summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2013-02-24 18:16:40 +0100
committerDaniel Friesel <derf@finalrewind.org>2013-02-24 18:16:40 +0100
commitcc7cb9f381e2687933b960da3599097beb727554 (patch)
tree4eebc0ac55b75c3beed7af8318c525d22c43dfa0
parent43a7d315ae6952e096ae3a0351273c5639377870 (diff)
downloadfeh-cc7cb9f381e2687933b960da3599097beb727554.zip
comparing floats with == and != is bad indeed.
-rw-r--r--ChangeLog5
-rw-r--r--src/winwidget.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 462a701..5e8f7a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+git HEAD
+
+ * Fix -F --zoom 100 not working in Gnome+Unity when compiling feh with
+ gcc and enabled optimizations (not -O0)
+
Thu, 14 Feb 2013 12:52:02 +0100 Daniel Friesel <derf+feh@finalrewind.org>
* Release v2.9.1
diff --git a/src/winwidget.c b/src/winwidget.c
index ada4c02..1f4fbc0 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -477,7 +477,7 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias)
double old_zoom = winwid->zoom;
winwid->zoom = 0.01 * opt.default_zoom;
- if (winwid->zoom != 1.0) {
+ if (opt.default_zoom != 100) {
if ((winwid->im_h * winwid->zoom) > max_h)
winwid->zoom = old_zoom;
else if ((winwid->im_w * winwid->zoom) > max_w)