From f47e1d499520080898782f422c14d2a92d125bb1 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Tue, 5 Apr 2016 12:16:27 -0500
Subject: [PATCH] [libpng16] Eliminated PNG_NO_INTEL_SSE_3BPP which was just
 for testing.

---
 ANNOUNCE                   | 7 +++++--
 CHANGES                    | 5 ++++-
 contrib/intel/intel_init.c | 2 --
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index d51e19b36..ec6a3d280 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.22beta04 - March 15, 2016
+Libpng 1.6.22beta04 - April 5, 2016
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -77,8 +77,11 @@ Version 1.6.22beta03 [March 9, 2016]
     meaningful fashion (John Bowler).
   Fixed some misleading indentation (Krishnaraj Bhat).
 
-Version 1.6.22beta04 [March 15, 2016]
+Version 1.6.22beta04 [April 5, 2016]
   Force GCC compilation to C89 if needed (Dagobert Michelsen).
+  SSE filter speed improvements for bpp=3:
+    memcpy-free implementations of load3() / store3().
+    call load3() only when needed at the end of a scanline.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 3a40300c6..bfff01e8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5537,8 +5537,11 @@ Version 1.6.22beta03 [March 9, 2016]
     meaningful fashion (John Bowler).
   Fixed some misleading indentation (Krishnaraj Bhat).
 
-Version 1.6.22beta04 [March 15, 2016]
+Version 1.6.22beta04 [April 5, 2016]
   Force GCC compilation to C89 if needed (Dagobert Michelsen).
+  SSE filter speed improvements for bpp=3:
+    memcpy-free implementations of load3() / store3().
+    call load3() only when needed at the end of a scanline.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/intel/intel_init.c b/contrib/intel/intel_init.c
index d0918d1bb..357e147b9 100644
--- a/contrib/intel/intel_init.c
+++ b/contrib/intel/intel_init.c
@@ -32,12 +32,10 @@ png_init_filter_functions_sse2(png_structp pp, unsigned int bpp)
    png_debug(1, "in png_init_filter_functions_sse2");
    if (bpp == 3)
    {
-#ifndef PNG_NO_INTEL_SSE_3BPP
       pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_sse2;
       pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_sse2;
       pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
          png_read_filter_row_paeth3_sse2;
-#endif
    }
    else if (bpp == 4)
    {