diff options
| author | bobo1on1 <bob-nospam-@xbmc.org> | 2012-03-18 00:51:49 +0100 |
|---|---|---|
| committer | bobo1on1 <bob-nospam-@xbmc.org> | 2012-03-18 00:51:49 +0100 |
| commit | e0af26ff8a8f89a29e405409bccc88cbc1fb6ea8 (patch) | |
| tree | 508472a0271a0163c9c2ce44099144d917cb464b /lib | |
| parent | 0056eee716f1f538258fe0cde4b893ca908961eb (diff) | |
Revert "fixed: compiler warning"
This reverts commit 10ecf8d6020e44321fb96cd0f9ca0c6f1651b5c4.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cximage-6.0/CxImage/ximapng.cpp | 2 | ||||
| -rw-r--r-- | lib/cximage-6.0/CxImage/ximapng.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/cximage-6.0/CxImage/ximapng.cpp b/lib/cximage-6.0/CxImage/ximapng.cpp index 89d2c88078..68d56ede47 100644 --- a/lib/cximage-6.0/CxImage/ximapng.cpp +++ b/lib/cximage-6.0/CxImage/ximapng.cpp @@ -612,7 +612,7 @@ bool CxImagePNG::Encode(CxFile *hFile) /* set the palette if there is one */ #ifdef USE_NEW_LIBPNG_API - png_colorp _palette = NULL; + png_colorp _palette; #endif if (GetPalette()){ #ifndef USE_NEW_LIBPNG_API diff --git a/lib/cximage-6.0/CxImage/ximapng.h b/lib/cximage-6.0/CxImage/ximapng.h index cead0348ef..7ea2a018db 100644 --- a/lib/cximage-6.0/CxImage/ximapng.h +++ b/lib/cximage-6.0/CxImage/ximapng.h @@ -30,8 +30,7 @@ extern "C" { #endif } -//#if PNG_LIBPNG_VER > 10399 -#if 1 +#if PNG_LIBPNG_VER > 10399 #define USE_NEW_LIBPNG_API #endif |