eed7c62887
All fixes by yours truly.
23 lines
607 B
Plaintext
23 lines
607 B
Plaintext
$OpenBSD: patch-image_c,v 1.1 2011/07/08 20:38:01 naddy Exp $
|
|
|
|
Fix build with png-1.5.
|
|
|
|
--- image.c.orig Wed Jul 6 17:22:24 2011
|
|
+++ image.c Wed Jul 6 17:22:58 2011
|
|
@@ -439,13 +439,13 @@ png_uint_32 ww, hh;
|
|
fclose(fp);
|
|
return NULL;
|
|
}
|
|
- if(setjmp(png_ptr->jmpbuf))
|
|
+ if(setjmp(png_jmpbuf(png_ptr)))
|
|
{
|
|
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
|
fclose(fp);
|
|
return NULL;
|
|
}
|
|
- if(info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)
|
|
+ if(png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_RGB_ALPHA)
|
|
{
|
|
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
|
fclose(fp);
|