diff --git a/jbig2dec/configure b/jbig2dec/configure

index e7195cc..6d92f3c 100755

--- a/jbig2dec/configure

+++ b/jbig2dec/configure

@@ -11201,9 +11201,9 @@ if test "$ac_res" != no; then

 fi

-  { $as_echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5

-$as_echo_n "checking for png_check_sig in -lpng... " >&6; }

-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then

+  { $as_echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5

+$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }

+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then

   $as_echo_n "(cached) " >&6

 else

   ac_check_lib_save_LIBS=$LIBS

@@ -11221,11 +11221,11 @@ cat >>conftest.$ac_ext <<_ACEOF

 #ifdef __cplusplus

 extern "C"

 #endif

-char png_check_sig ();

+char png_sig_cmp ();

 int

 main ()

 {

-return png_check_sig ();

+return png_sig_cmp ();

   ;

   return 0;

 }

@@ -11251,12 +11251,12 @@ $as_echo "$ac_try_echo") >&5

 	 test "$cross_compiling" = yes ||

 	 $as_test_x conftest$ac_exeext

        }; then

-  ac_cv_lib_png_png_check_sig=yes

+  ac_cv_lib_png_png_sig_cmp=yes

 else

   $as_echo "$as_me: failed program was:" >&5

 sed 's/^/| /' conftest.$ac_ext >&5

-	ac_cv_lib_png_png_check_sig=no

+	ac_cv_lib_png_png_sig_cmp=no

 fi

 rm -rf conftest.dSYM

@@ -11264,9 +11264,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \

       conftest$ac_exeext conftest.$ac_ext

 LIBS=$ac_check_lib_save_LIBS

 fi

-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5

-$as_echo "$ac_cv_lib_png_png_check_sig" >&6; }

-if test "x$ac_cv_lib_png_png_check_sig" = x""yes; then

+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5

+$as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }

+if test "x$ac_cv_lib_png_png_sig_cmp" = x""yes; then

     { $as_echo "$as_me:$LINENO: checking for deflate in -lz" >&5

 $as_echo_n "checking for deflate in -lz... " >&6; }

diff --git a/jbig2dec/jbig2_image_png.c b/jbig2dec/jbig2_image_png.c

index 342c0c3..0409d8e 100644

--- a/jbig2dec/jbig2_image_png.c

+++ b/jbig2dec/jbig2_image_png.c

@@ -33,7 +33,7 @@ jbig2_png_write_data(png_structp png_ptr, png_bytep data, png_size_t length)

 {

     png_size_t check;

-    check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr);

+    check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));

     if (check != length) {

       png_error(png_ptr, "Write Error");

     }

@@ -43,7 +43,7 @@ static void

 jbig2_png_flush(png_structp png_ptr)

 {

     png_FILE_p io_ptr;

-    io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));

+    io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr);

     if (io_ptr != NULL)

         fflush(io_ptr);

 }