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

Make feh abort immediately if an index image could not be created (#306)

parent 9ffb418a

src/index.c

+2 −1
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ void init_index_mode(void) 
	im_main = imlib_create_image(index_image_width, index_image_height);



	if (!im_main)

		eprintf("Imlib error creating index image, are you low on RAM?");

		eprintf("Failed to create %dx%d pixels (%d MB) index image. Do you have enough RAM?",

				index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));



	if (bg_im)

		gib_imlib_blend_image_onto_image(im_main, bg_im,

src/thumbnail.c

+5 −3
Original line number Diff line number Diff line
@@ -144,12 +144,14 @@ void init_thumbnail_mode(void) 


	index_image_width = td.w;

	index_image_height = td.h + title_area_h;

	D(("imlib_create_image(%d, %d)", index_image_width, index_image_height));

	D(("imlib_create_image(%d, %d)\n", index_image_width, index_image_height));

	td.im_main = imlib_create_image(index_image_width, index_image_height);

	gib_imlib_image_set_has_alpha(td.im_main, 1);



	if (!td.im_main)

		eprintf("Imlib error creating index image, are you low on RAM?");

		eprintf("Failed to create %dx%d pixels (%d MB) index image. Do you have enough RAM?",

				index_image_width, index_image_height, index_image_width * index_image_height * 4 / (1024*1024));



	gib_imlib_image_set_has_alpha(td.im_main, 1);



	if (td.im_bg)

		gib_imlib_blend_image_onto_image(td.im_main, td.im_bg,