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

show error message if -o / -O failed to save image

parent ed5b2d5a

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ git HEAD 
      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

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



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

src/index.c

+6 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
/* TODO s/bit/lot */

void init_index_mode(void)

{

	Imlib_Load_Error err;

	Imlib_Image im_main;

	Imlib_Image im_temp;

	int w = 800, h = 600, ww = 0, hh = 0, www, hhh, xxx, yyy;
@@ -326,8 +327,11 @@ void init_index_mode(void) 
		else

			strncpy(output_buf, opt.output_file, 1024);



		gib_imlib_save_image(im_main, output_buf);

		if (opt.verbose) {

		ungib_imlib_save_image_with_error_return(im_main, output_buf, &err);

		if (err) {

			weprintf("Cannot save image to %s", output_buf);

		}

		else if (opt.verbose) {

			int tw, th;



			tw = gib_imlib_image_get_width(im_main);

src/thumbnail.c

+6 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ void init_thumbnail_mode(void) 
	   int max_column_w = 0;

	 */



	Imlib_Load_Error err;

	Imlib_Image im_temp;

	int ww = 0, hh = 0, www, hhh, xxx, yyy;

	int orig_w, orig_h;
@@ -381,8 +382,11 @@ void init_thumbnail_mode(void) 
			snprintf(output_buf, 1024, "%s/%s", opt.output_dir, opt.output_file);

		else

			strncpy(output_buf, opt.output_file, 1024);

		gib_imlib_save_image(td.im_main, output_buf);

		if (opt.verbose) {

		ungib_imlib_save_image_with_error_return(td.im_main, output_buf, &err);

		if (err) {

			weprintf("Cannot save image to %s", output_buf);

		}

		else if (opt.verbose) {

			int tw, th;



			tw = gib_imlib_image_get_width(td.im_main);