Skip to content
Browse files

Merge branch 'master' of git://github.com/derf/feh

  • Loading branch information...
2 parents a81465d + 52d5da9 commit 93a90e60d0cf093ca71c34f4f5dbfde974f433f0 @reald committed Mar 6, 2012
Showing with 7 additions and 9 deletions.
  1. +2 −3 ChangeLog
  2. +2 −1 README
  3. +3 −5 src/keyevents.c
View
5 ChangeLog
@@ -1,12 +1,11 @@
-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,
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
View
3 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.
View
8 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);

0 comments on commit 93a90e6

Please sign in to comment.
Something went wrong with that request. Please try again.