From 4c5f83c5c3c4103ace9c7c84c19dc5042a9af0e8 Mon Sep 17 00:00:00 2001
From: Erin Pinheiro <Lana-chan@users.noreply.github.com>
Date: Tue, 1 Nov 2022 19:14:48 -0300
Subject: [PATCH] patch for libpng14 compatibility

---
 src/pilot-read-notepad.c    | 8 ++------
 src/pilot-read-palmpix.c    | 8 ++------
 src/pilot-read-screenshot.c | 8 ++------
 src/pilot-read-veo.c        | 8 ++------
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/pilot-read-notepad.c b/src/pilot-read-notepad.c
index 06ee26f2..e33025ab 100644
--- a/src/pilot-read-notepad.c
+++ b/src/pilot-read-notepad.c
@@ -39,10 +39,6 @@
 
 #ifdef HAVE_PNG
 #include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
-#endif
 #endif
 
 const char *progname;
@@ -166,8 +162,8 @@ void write_png( FILE *f, struct NotePad *n )
    width = n->body.width + 8;
 
    png_ptr = png_create_write_struct
-     ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-       png_error_ptr_NULL, png_error_ptr_NULL);
+     ( PNG_LIBPNG_VER_STRING, NULL,
+       NULL, NULL);
 
    if(!png_ptr)
      return;
diff --git a/src/pilot-read-palmpix.c b/src/pilot-read-palmpix.c
index 2c005517..5799ab3a 100644
--- a/src/pilot-read-palmpix.c
+++ b/src/pilot-read-palmpix.c
@@ -42,10 +42,6 @@
 
 #ifdef HAVE_PNG
 #include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
-#endif
 #endif
 
 const char *progname;
@@ -223,8 +219,8 @@ void write_png( FILE *f, const struct PalmPixState *state,
 	png_infop info_ptr;
 
 	png_ptr = png_create_write_struct
-		( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-		png_error_ptr_NULL, png_error_ptr_NULL);
+		( PNG_LIBPNG_VER_STRING, NULL,
+		NULL, NULL);
 
 	if(!png_ptr)
 		return;
diff --git a/src/pilot-read-screenshot.c b/src/pilot-read-screenshot.c
index a3106a30..18de0222 100644
--- a/src/pilot-read-screenshot.c
+++ b/src/pilot-read-screenshot.c
@@ -40,10 +40,6 @@
 
 #ifdef HAVE_PNG
 # include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-#  define png_voidp_NULL (png_voidp)NULL
-#  define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
 #endif
 
 #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -87,8 +83,8 @@ void write_png ( char *fname, struct ss_state *state )
 		gray_buf = malloc( state->w );
 
 	png_ptr = png_create_write_struct
-		(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-		png_error_ptr_NULL, png_error_ptr_NULL);
+		(PNG_LIBPNG_VER_STRING, NULL,
+		NULL, NULL);
 
 	if (!png_ptr)
 		return;
diff --git a/src/pilot-read-veo.c b/src/pilot-read-veo.c
index 73aa53b7..6ecc79f9 100644
--- a/src/pilot-read-veo.c
+++ b/src/pilot-read-veo.c
@@ -41,10 +41,6 @@
 
 #ifdef HAVE_PNG
 # include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-#  define png_voidp_NULL (png_voidp)NULL
-#  define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
 #endif
 
 #define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -856,8 +852,8 @@ void write_png (FILE * f, struct Veo *v, long flags)
    png_infop info_ptr;
 
    png_ptr = png_create_write_struct
-	 (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-	  png_error_ptr_NULL, png_error_ptr_NULL);
+	 (PNG_LIBPNG_VER_STRING, NULL,
+	  NULL, NULL);
 
    if (!png_ptr)
 	 return;