From: glennrp <glennrp@git.imagemagick.org>
Date: Thu, 6 Nov 2014 12:59:43 +0000 (+0000)
Subject: Reverted incorrect change of PNG_LIBPNG_VER_STRING to png_get_libpng_ver(NULL).
X-Git-Tag: 7.0.1-0~1776
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e0971dc28bdc9227481f5a7f9e1510be662ec4a;p=imagemagick

Reverted incorrect change of PNG_LIBPNG_VER_STRING to png_get_libpng_ver(NULL).
---

diff --git a/coders/png.c b/coders/png.c
index 3dd294dfc..9bb71bebe 100644
--- 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