Reverted incorrect change of PNG_LIBPNG_VER_STRING to png_get_libpng_…

…ver(NULL).
ImageMagick · Nov 6, 2014 · 3e0971d · 3e0971d
1 parent 0d67b92
commit 3e0971d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/coders/png.c b/coders/png.c
@@ -2149,11 +2149,11 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
 #ifdef PNG_USER_MEM_SUPPORTED
  error_info.image=image;
  error_info.exception=exception;
- ping=png_create_read_struct_2(png_get_libpng_ver(NULL),&error_info,
+ ping=png_create_read_struct_2(PNG_LIBPNG_VER_STRING,&error_info,
    MagickPNGErrorHandler,MagickPNGWarningHandler, NULL,
    (png_malloc_ptr) Magick_png_malloc,(png_free_ptr) Magick_png_free);
 #else
-  ping=png_create_read_struct(png_get_libpng_ver(NULL),&error_info,
+  ping=png_create_read_struct(PNG_LIBPNG_VER_STRING,&error_info,
     MagickPNGErrorHandler,MagickPNGWarningHandler);
 #endif
   if (ping == (png_struct *) NULL)
@@ -9329,12 +9329,12 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
 #ifdef PNG_USER_MEM_SUPPORTED
  error_info.image=image;
  error_info.exception=exception;
-  ping=png_create_write_struct_2(png_get_libpng_ver(NULL),&error_info,
+  ping=png_create_write_struct_2(PNG_LIBPNG_VER_STRING,&error_info,
     MagickPNGErrorHandler,MagickPNGWarningHandler,(void *) NULL,
     (png_malloc_ptr) Magick_png_malloc,(png_free_ptr) Magick_png_free);
 
 #else
-  ping=png_create_write_struct(png_get_libpng_ver(NULL),&error_info,
+  ping=png_create_write_struct(PNG_LIBPNG_VER_STRING,&error_info,
     MagickPNGErrorHandler,MagickPNGWarningHandler);
 
 #endif