Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
abd5ea0a
Commit
abd5ea0a
authored
Jun 09, 2011
by
Davis King
Browse files
Fixed a bug which caused multiply defined symbol errors during linking
if the PNG saving routine was #included.
parent
7e8af32b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
dlib/image_saver/save_png.h
dlib/image_saver/save_png.h
+2
-2
No files found.
dlib/image_saver/save_png.h
View file @
abd5ea0a
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment