From 7342fcaf926142aac20f96e85cd5fb113e6ad99b Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Thu, 27 Oct 2011 19:56:36 -0500
Subject: [PATCH] [libpng] #define PNG_ALIGN_TYPE PNG_ALIGN_NONE in
 contrib/pngminim/*/pngusr.h

---
 ANNOUNCE                          | 1 +
 CHANGES                           | 1 +
 contrib/pngminim/decoder/pngusr.h | 1 +
 contrib/pngminim/encoder/pngusr.h | 1 +
 contrib/pngminim/preader/pngusr.h | 1 +
 5 files changed, 5 insertions(+)

diff --git a/ANNOUNCE b/ANNOUNCE
index 7e7948786..99b0c50f2 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -103,6 +103,7 @@ Version 1.5.6rc03 [October 28, 2011]
     enables that fix for all compilers when using compile-time constants.
     Under MSYS 'byte' is a name declared in a system header file, so we
     changed the name of a local variable to avoid the warnings that result.
+  Added #define PNG_ALIGN_TYPE PNG_ALIGN_NONE to contrib/pngminim/*/pngusr.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 4d5aa2ce8..0f8d8b619 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3664,6 +3664,7 @@ Version 1.5.6rc03 [October 28, 2011]
     enables that fix for all compilers when using compile-time constants.
     Under MSYS 'byte' is a name declared in a system header file, so we
     changed the name of a local variable to avoid the warnings that result.
+  Added #define PNG_ALIGN_TYPE PNG_ALIGN_NONE to contrib/pngminim/*/pngusr.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h
index ce8553752..9d9c50c40 100644
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -19,5 +19,6 @@
  */
 
 #define PNG_NO_WARNINGS
+#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
 
 #endif /* MINRDPNGCONF_H */
diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h
index fb35245ee..2033aadb2 100644
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -19,5 +19,6 @@
  */
 
 #define PNG_NO_WARNINGS
+#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
 
 #endif /* MINWRPNGCONF_H */
diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h
index b40cc46ce..73cfecfbf 100644
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -19,5 +19,6 @@
  */
 
 #define PNG_NO_WARNINGS
+#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
 
 #endif /* MINPRDPNGCONF_H */
-- 
GitLab