Commit d665f6ae authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Do not enable imagemagick by default

parent 9ed501cd
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ git HEAD
      (consequence: lossless rotate no longer works for such files)
    * --reload now accepts rational numbers
    * Fix --filelist trying to load .txt files with imagemagick
    * imagemagick support is now disabled by default, to make feh behaviour
      less confusing. Set --magick-timeout to a non-negative value to enable
      it (--magick-timeout 5 for feh-2.5 behaviour)

Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>

+4 −10
Original line number Diff line number Diff line
@@ -118,18 +118,12 @@ can open any format supported by Imlib2, most notably jpeg and png.
If the convert binary
.Pq supplied by ImageMagick
is available, it also has limited support for many other filetypes, such as
svg, xcf and otf.
svg, xcf and otf. Use
.Cm --magick-timeout Ar num
with a non-negative value to enable it.
.
For animated images, only the first frame is shown.
.
.Pp
.
If you don't like the results produced by convert, disable it with
.Qq --magick-timeout -1 .
Also, note that
.Nm
will only try to convert a file for up to five seconds by default.
.
.
.Sh OPTIONS
.
@@ -401,7 +395,7 @@ Stop trying to convert unloadable files after
seconds. A negative value disables covert / magick support altogether, a value
of zero causes
.Nm
to try indefinitely. Default timeout is 5 seconds.
to try indefinitely. By default, magick support is disabled.
.
.It Cm -M , --menu-font Ar font
.
+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void init_parse_options(int argc, char **argv)
	opt.display = 1;
	opt.aspect = 1;
	opt.slideshow_delay = 0.0;
	opt.magick_timeout = 5;
	opt.magick_timeout = -1;
	opt.thumb_w = 60;
	opt.thumb_h = 60;
	opt.thumb_redraw = 10;