diff options
| author | Daniel Teske <daniel.teske@nokia.com> | 2011-11-22 17:59:31 (GMT) |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2011-11-22 18:04:12 (GMT) |
| commit | 6b6397f91125ddfc2abdea9704bbed08beb22ab7 (patch) | |
| tree | e05bb038067bc065bb01e954208fc09637504c39 /src/3rdparty/libpng/pngtrans.c | |
| parent | 81ae9027b72dcf3635d2fb9f20e63d60b35d62e8 (diff) | |
| download | Qt-6b6397f91125ddfc2abdea9704bbed08beb22ab7.zip Qt-6b6397f91125ddfc2abdea9704bbed08beb22ab7.tar.gz Qt-6b6397f91125ddfc2abdea9704bbed08beb22ab7.tar.bz2 | |
Hide png symbols in a namespace for -qt-libpng
If qt is compiled with -qt-libpng then the png symbols
prevent a loading of another libpng. With this patch
the png symbols are hidden and thus it is possible
to load another libpng.
Reviewed-by: hjk <qtc-committer@nokia.com>
Diffstat (limited to 'src/3rdparty/libpng/pngtrans.c')
| -rw-r--r-- | src/3rdparty/libpng/pngtrans.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/libpng/pngtrans.c b/src/3rdparty/libpng/pngtrans.c index 6a6908d..2e84686 100644 --- a/src/3rdparty/libpng/pngtrans.c +++ b/src/3rdparty/libpng/pngtrans.c @@ -13,6 +13,8 @@ #include "pngpriv.h" +namespace PrivatePng { + #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED) @@ -676,3 +678,4 @@ png_get_current_pass_number(png_const_structp png_ptr) #endif /* PNG_READ_USER_TRANSFORM_SUPPORTED || PNG_WRITE_USER_TRANSFORM_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +} // namespace PrivatePng |