aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/cximage-6.0/CxImage/ximapng.cpp2
-rw-r--r--lib/cximage-6.0/CxImage/ximapng.h3
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