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

feh_png: Update to new libpng API, fixes compilation issues with 1.5.1

parent 1bd5482d

ChangeLog

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ git HEAD 
      "make xinerama=0 debug=1". By default feh is compiled with xinerama and

      libcurl support enabled, see README.

    * Remove builtin http client (--builtin)

    * Fix compilation issues with libpng 1.5.1



Wed, 09 Feb 2011 20:11:26 +0100  Daniel Friesel <derf@finalrewind.org>

src/feh_png.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ gib_hash *feh_png_read_comments(char *file) 
		return hash;

	}



	if (setjmp(png_ptr->jmpbuf)) {

	if (setjmp(png_jmpbuf(png_ptr))) {

		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);

		fclose(fp);

		return hash;
@@ -124,7 +124,7 @@ int feh_png_write_png(Imlib_Image image, char *file, ...) 
		return 0;

	}



	if (setjmp(png_ptr->jmpbuf)) {

	if (setjmp(png_jmpbuf(png_ptr))) {

		fclose(fp);

		png_destroy_write_struct(&png_ptr, &info_ptr);

		png_destroy_info_struct(png_ptr, &info_ptr);