Commit 9e8eea06 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

--max-dimension: ignore width/height limit of 0 pixels

parent 79e0f0b7

ChangeLog

+4 −0
Original line number Diff line number Diff line 
git HEAD



    * --max-dimension: ignore width/height limit of 0 pixels



Thu, 15 May 2014 23:41:07 +0200  Daniel Friesel <derf+feh@finalrewind.org>



* Releasev v2.12

man/feh.pre

+2 −2
Original line number Diff line number Diff line
@@ -420,8 +420,8 @@ Only show images with width <= 
.Ar width

and height <=

.Ar height .

If you only care about one parameter, set the other to either something large

or -1.

If you only care about one parameter, set the other to 0

.Pq or a negative value .

.

.It Cm -M , --menu-font Ar font

.

src/options.c

+4 −0
Original line number Diff line number Diff line
@@ -421,6 +421,10 @@ static void feh_parse_option_array(int argc, char **argv, int finalrun) 
			break;

		case '<':

			XParseGeometry(optarg, &discard, &discard, &opt.max_width, &opt.max_height);

			if (opt.max_width == 0)

				opt.max_width = UINT_MAX;

			if (opt.max_height == 0)

				opt.max_height = UINT_MAX;

			break;

		case '>':

			XParseGeometry(optarg, &discard, &discard, &opt.min_width, &opt.min_height);