From 422cbeb8cceac07a96ddff808da7ccb3110be725 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 6 Mar 2012 12:28:59 +0100
Subject: Revert "fix zoom_default for --scale-down"
This reverts commit b257e011c4390900f14491e2cffe38b2d00892ec.
Conflicts:
ChangeLog
---
ChangeLog | 2 --
src/keyevents.c | 8 +++-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 50bf99b..41d7dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,6 @@ git HEAD
* format specifier %P now prints the number of pixels with k/M suffix,
like %S. Printing the program name ("feh") is no longer supported
* feh --list now uses %S/%P to print image size and amount of pixels
- * Fix zoom_default key (caused blurry images in some cases due to a bad
- workaround)
* make --quiet and --verbose behave more like their documented way, never
ignore out of memory errors
* Use ImageMagick (convert) as loader for unsupported file formats
diff --git a/src/keyevents.c b/src/keyevents.c
index fd8a4d2..0ada751 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -607,11 +607,9 @@ void feh_event_handle_keypress(XEvent * ev)
winwid->old_zoom = 1.001;
winwidget_center_image(winwid);
winwidget_render_image(winwid, 0, 0);
- /*
- * --scale-down used to do weird stuff for zoom = 1.0, but setting
- * it to another value here is not the way to go. Also, couldn't
- * reproduce the issue -- 2012-02-16
- */
+ /* --scale-down will also do weird stuff if zoom is 1.0 */
+ if (opt.scale_down)
+ winwid->zoom = 1.001;
}
else if (feh_is_kp(&keys.zoom_fit, keysym, state)) {
feh_calc_needed_zoom(&winwid->zoom, winwid->im_w, winwid->im_h, winwid->w, winwid->h);
--
cgit v1.2.3
From 52d5da9c0d6e4f10b5cba384297821008dbbed2b Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 6 Mar 2012 13:15:04 +0100
Subject: Release time.
---
ChangeLog | 3 ++-
README | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 41d7dcd..170e89b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
-git HEAD
+Tue, 06 Mar 2012 13:13:35 +0100 Daniel Friesel <derf@finalrewind.org>
+* Release v2.4
* exif-support fixes by Dennis Real
* format specifier %S now uses the appropriate suffix (B/kB/MB)
* format specifier %P now prints the number of pixels with k/M suffix,
diff --git a/README b/README
index 97c644c..19c14cc 100644
--- a/README
+++ b/README
@@ -24,6 +24,7 @@ Recommended
-----------
* jpegtran (supplied by the jpeg library, for lossless image rotation)
+ * convert (supplied by ImageMagick, can be used to load unsuppoted formats)
Installation
------------
@@ -44,10 +45,10 @@ Available flags are:
* curl (default 1) - use libcurl to view http:// and similar images
* debug (default 0) - debug build, enables --debug
+ * exif (default 0) - Builtin EXIF tag display support
* help (default 0) - include help text (refers to the manpage otherwise)
* stat64 (default 0) - Support CIFS shares from 64bit hosts on 32bit machines
* xinerama (default 1) - Support Xinerama/XRandR multiscreen setups
- * exif (default 0) - Builtin EXIF tag display support
So, by default libcurl and Xinerama are enabled, the rest is disabled.
--
cgit v1.2.3