mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Removed some extern "C" declarations from libpng

Browse source
This commit is contained in:
Tom Poole 2019-06-28 15:34:16 +01:00
parent 5935040d78
commit 0e00e83944
4 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/juce_graphics/image_formats/juce_PNGLoader.cpp
View file

@ -271,8 +271,8 @@ namespace pnglibNamespace
#define PNG_sCAL_PRECISION 5 #define PNG_sCAL_PRECISION 5
#define PNG_sRGB_PROFILE_CHECKS 2 #define PNG_sRGB_PROFILE_CHECKS 2
#define PNG_LINKAGE_API inline #define PNG_LINKAGE_API
#define PNG_LINKAGE_FUNCTION inline #define PNG_LINKAGE_FUNCTION
#define PNG_ARM_NEON_OPT 0 #define PNG_ARM_NEON_OPT 0

4
modules/juce_graphics/image_formats/pnglib/libpng_readme.txt
View file

@ -1,2 +1,4 @@
These files are from the libpng library - http://www.libpng.org/ These files are from the libpng library - http://www.libpng.org/
We have removed all `extern "C"` from the library to prevent symbol collision
with projects that use their own version of libpng.

16
modules/juce_graphics/image_formats/pnglib/png.h
View file

@ -363,10 +363,11 @@
#ifndef PNG_VERSION_INFO_ONLY #ifndef PNG_VERSION_INFO_ONLY
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */ // JUCE modification
#ifdef __cplusplus ///* Inhibit C++ name-mangling for libpng functions but not for system calls. */
extern "C" { //#ifdef __cplusplus
#endif /* __cplusplus */ //extern "C" {
//#endif /* __cplusplus */
/* Version information for C files, stored in png.c. This had better match /* Version information for C files, stored in png.c. This had better match
* the version above. * the version above.
@ -3238,9 +3239,10 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
PNG_EXPORT_LAST_ORDINAL(249); PNG_EXPORT_LAST_ORDINAL(249);
#endif #endif
#ifdef __cplusplus // JUCE modification
} //#ifdef __cplusplus
#endif //}
//#endif
#endif /* PNG_VERSION_INFO_ONLY */ #endif /* PNG_VERSION_INFO_ONLY */
/* Do not put anything past this line */ /* Do not put anything past this line */

16
modules/juce_graphics/image_formats/pnglib/pngpriv.h
View file

@ -958,10 +958,11 @@ PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);
#endif /* SIMPLIFIED_READ/WRITE */ #endif /* SIMPLIFIED_READ/WRITE */
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */ // JUCE modification
#ifdef __cplusplus ///* Inhibit C++ name-mangling for libpng functions but not for system calls. */
extern "C" { //#ifdef __cplusplus
#endif /* __cplusplus */ //extern "C" {
//#endif /* __cplusplus */
/* Internal functions; these are not exported from a DLL however because they /* Internal functions; these are not exported from a DLL however because they
* are used within several of the C source files they have to be C extern. * are used within several of the C source files they have to be C extern.
@ -2144,9 +2145,10 @@ PNG_INTERNAL_FUNCTION(int,
#include "pngdebug.h" #include "pngdebug.h"
#ifdef __cplusplus // JUCE modification
} //#ifdef __cplusplus
#endif //}
//#endif
#endif /* PNG_VERSION_INFO_ONLY */ #endif /* PNG_VERSION_INFO_ONLY */
#endif /* PNGPRIV_H */ #endif /* PNGPRIV_H */