Commit abd5ea0a authored by Davis King's avatar Davis King

Fixed a bug which caused multiply defined symbol errors during linking

if the PNG saving routine was #included.
parent 7e8af32b
...@@ -21,11 +21,11 @@ namespace dlib ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment