OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed a bug which caused multiply defined symbol errors during linking 

if the PNG saving routine was #included.
This commit is contained in:
Davis King 2011-06-09 18:23:32 -04:00
parent 7e8af32b1d
commit abd5ea0a70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlib/image_saver/save_png.h
View File

@ -21,11 +21,11 @@ namespace dlib
#ifdef DLIB_PNG_SUPPORT #ifdef DLIB_PNG_SUPPORT
// Don't do anything when libpng calls us to tell us about an error. Just return to // Don't do anything when libpng calls us to tell us about an error. Just return to
// our own code and throw an exception (at the long jump target). // our own code and throw an exception (at the long jump target).
void png_reader_user_error_fn_silent(png_structp png_struct, png_const_charp ) inline void png_reader_user_error_fn_silent(png_structp png_struct, png_const_charp )
{ {
longjmp(png_jmpbuf(png_struct),1); longjmp(png_jmpbuf(png_struct),1);
} }
void png_reader_user_warning_fn_silent(png_structp , png_const_charp ) inline void png_reader_user_warning_fn_silent(png_structp , png_const_charp )
{ {
} }
#endif #endif