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

Fix lossless rotate error message for non-JPEG images

parent 31c67831

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ git HEAD 
      when running feh on the current working directory, '/path/to/./image.png'

      was used for thumbnail name generation. Now it is always

      '/path/to/image.png'

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



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

src/imlib.c

+5 −1
Original line number Diff line number Diff line
@@ -1000,6 +1000,7 @@ void feh_edit_inplace(winwidget w, int op) 
{

	int ret;

	Imlib_Image old;

	Imlib_Load_Error err;

	if (!w->file || !w->file->data || !FEH_FILE(w->file->data)->filename)

		return;
@@ -1019,8 +1020,11 @@ void feh_edit_inplace(winwidget w, int op) 
			imlib_image_flip_horizontal();

		} else

			gib_imlib_image_orientate(old, op);

		gib_imlib_save_image(old, FEH_FILE(w->file->data)->filename);

		ungib_imlib_save_image_with_error_return(old,

			FEH_FILE(w->file->data)->filename, &err);

		gib_imlib_free_image(old);

		if (err)

			im_weprintf(w, "Failed to save image after operation");

		feh_reload_image(w, 1, 1);

	} else {

		im_weprintf(w, "failed to load image from disk to edit it in place");