Commit 3a1b0727 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Show error message if normal load failed (broken by 2.4) + update tests

parent 290b5964

ChangeLog

+3 −1
Original line number Diff line number Diff line 
git HEAD

Thu, 13 Sep 2012 12:00:06 +0200  Daniel Friesel <derf+feh@finalrewind.org>



    * Fix freedesktop.org Thumbnail Managing Standard implementation:

      when running feh on the current working directory, '/path/to/./image.png'
@@ -6,6 +6,8 @@ git HEAD 
      '/path/to/image.png'

    * Show error message if lossless rotate / flip failed on non-JPEG image

    * Show error message if -O / -o failed to save image

    * Show error message if load failed and magick is disabled (was broken

      by feh 2.4)



Tue, 28 Aug 2012 11:46:19 +0200  Daniel Friesel <derf+feh@finalrewind.org>

src/imlib.c

+1 −7
Original line number Diff line number Diff line
@@ -234,10 +234,7 @@ int feh_load_image(Imlib_Image * im, feh_file * file) 
		tmpname = feh_magick_load_image(file->filename);

	}



	if (image_source != SRC_IMLIB) {

		if (tmpname == NULL)

			return 0;



	if ((image_source != SRC_IMLIB) && tmpname) {

		*im = imlib_load_image_with_error_return(tmpname, &err);

		if (im) {

			real_filename = file->filename;
@@ -336,9 +333,6 @@ static char *feh_magick_load_image(char *filename) 
				if (WIFSIGNALED(status))

					weprintf("%s - Conversion took too long, skipping",

						filename);

				else

					weprintf("%s - No loader for that file format",

						filename);

			}



			/*

test/feh.t

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ if (length($feh_name) == 0) { 
}



my $re_warning =

	qr{${feh_name} WARNING: test/fail/... \- No loader for that file format\n};

	qr{${feh_name} WARNING: test/fail/... \- No Imlib2 loader for that file format\n};

my $re_loadable = qr{test/ok/...};

my $re_unloadable = qr{test/fail/...};

my $re_list_action = qr{test/ok/... 16x16};