summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--config.mk2
-rw-r--r--src/winwidget.c2
3 files changed, 7 insertions, 2 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/config.mk b/config.mk
index bd598df..d17c0ab 100644
--- a/config.mk
+++ b/config.mk
@@ -22,7 +22,7 @@ curl ?= 1
debug ?= 0
help ?= 0
xinerama ?= 1
-exif ?= 1
+exif ?= 0
ifeq (${curl},1)
CFLAGS += -DHAVE_LIBCURL
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)