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/pngrio.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/pngrio.c')
| -rw-r--r-- | src/3rdparty/libpng/pngrio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/libpng/pngrio.c b/src/3rdparty/libpng/pngrio.c index e9c381c..3a6e536 100644 --- a/src/3rdparty/libpng/pngrio.c +++ b/src/3rdparty/libpng/pngrio.c @@ -20,6 +20,7 @@ #include "pngpriv.h" +namespace PrivatePng { #ifdef PNG_READ_SUPPORTED /* Read the data from whatever input you are using. The default routine @@ -174,3 +175,4 @@ png_set_read_fn(png_structp png_ptr, png_voidp io_ptr, #endif } #endif /* PNG_READ_SUPPORTED */ +} // namespace PrivatePng |