From d02d6a1c7dad96860f5c93b72eb5df34a1980866 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 26 Sep 2011 16:43:08 -0500
Subject: [PATCH] [libpng15] Fixed a typo in the definition of the new
 PNG_STRING_FROM_CHUNK(s,c)

macro.
---
 ANNOUNCE  | 1 +
 CHANGES   | 1 +
 pngpriv.h | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index d582df10f..ac706cb49 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -43,6 +43,7 @@ Version 1.5.6beta01 [September 22, 2011]
 Version 1.5.6beta02 [September 26, 2011]
   Added a note in the manual the png_read_update_info() must be called only
     once with a particular info_ptr.
+  Fixed a typo in the definition of the new PNG_STRING_FROM_CHUNK(s,c) macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 85cfeafa0..d9228662d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3604,6 +3604,7 @@ Version 1.5.6beta01 [September 22, 2011]
 Version 1.5.6beta02 [September 26, 2011]
   Added a note in the manual the png_read_update_info() must be called only
     once with a particular info_ptr.
+  Fixed a typo in the definition of the new PNG_STRING_FROM_CHUNK(s,c) macro.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngpriv.h b/pngpriv.h
index 4a73b66df..1f102ccbf 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -554,7 +554,7 @@ PNG_EXTERN png_fixed_point png_fixed PNGARG((png_structp png_ptr, double fp,
  */
 #define PNG_STRING_FROM_CHUNK(s,c)\
    (void)(((char*)(s))[0]=(char)((c)>>24), ((char*)(s))[1]=(char)((c)>>16),\
-   ((char*)(s))[3]=(char)((c)>>8), ((char*)(s))[3]=(char)((c)))
+   ((char*)(s))[2]=(char)((c)>>8), ((char*)(s))[3]=(char)((c)))
 
 /* Do the same but terminate with a null character. */
 #define PNG_CSTRING_FROM_CHUNK(s,c)\