mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[devel] Imported from libpng-1.5.0beta09.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson
2010-02-19 14:09:09 -06:00
parent a24fc2e1d3
commit 95ca51b6e2
28 changed files with 78 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pngerror.c
View File

@@ -243,7 +243,7 @@ png_set_longjmp_fn(png_structp png_ptr, png_longjmp_ptr longjmp_fn,
return NULL;
png_ptr->longjmp_fn = longjmp_fn;
return &png_ptr->jmpbuf;
return &png_ptr->png_jmpbuf;
}
#endif
@@ -303,12 +303,12 @@ png_longjmp(png_structp png_ptr, int val)
{
# ifdef USE_FAR_KEYWORD
{
jmp_buf jmpbuf;
png_memcpy(jmpbuf, png_ptr->jmpbuf, png_sizeof(jmp_buf));
png_ptr->longjmp_fn(jmpbuf, val);
jmp_buf png_jmpbuf;
png_memcpy(png_jmpbuf, png_ptr->png_jmpbuf, png_sizeof(jmp_buf));
png_ptr->longjmp_fn(png_jmpbuf, val);
}
# else
png_ptr->longjmp_fn(png_ptr->jmpbuf, val);
png_ptr->longjmp_fn(png_ptr->png_jmpbuf, val);
# endif
}
#endif
@@ -367,7 +367,7 @@ png_default_warning(png_structp png_ptr, png_const_charp warning_message)
/* This function is called when the application wants to use another method
* of handling errors and warnings. Note that the error function MUST NOT
* return to the calling routine or serious problems will occur. The return
* method used in the default routine calls longjmp(png_ptr->jmpbuf, 1)
* method used in the default routine calls longjmp(png_ptr->png_jmpbuf, 1)
*/
void PNGAPI
png_set_error_fn(png_structp png_ptr, png_voidp error_ptr,