--- ./Amaya/thotlib/image/pnghandler.c.orig	2012-04-07 23:49:54.000000000 -0700
+++ ./Amaya/thotlib/image/pnghandler.c	2012-04-07 23:52:02.000000000 -0700
@@ -149,7 +149,7 @@ static unsigned char *ReadPng (FILE *pfF
         png_destroy_read_struct (&png_ptr, NULL, NULL);
         return NULL;
       }   
-    if (setjmp (png_ptr->jmpbuf))
+    if (setjmp (png_jmpbuf(png_ptr)))
       {
         /* Free all of the memory associated with the png_ptr and info_ptr */
         png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);
@@ -858,7 +858,7 @@ ThotBool SavePng (const char *filename,
       png_destroy_write_struct(&png, (png_infopp) NULL);
       return FALSE;
     }
-  if (setjmp(png->jmpbuf)) 
+  if (setjmp(png_jmpbuf(png))) 
     {
         png_destroy_write_struct(&png, &pngInfo);
         TtaWriteClose (pngFile);