[libpng16] Imported from libpng-1.6.25rc02.tar

ANNOUNCE

@@ -1,36 +1,46 @@
-Libpng 1.6.25 - September 1, 2016
+Libpng 1.6.25rc02 - August 29, 2016
 
-This is a public release of libpng, intended for use in production codes.
+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.
 
 Files available for download:
 
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   libpng-1.6.25.tar.xz (LZMA-compressed, recommended)
-   libpng-1.6.25.tar.gz
+   1.6.25rc02.tar.xz (LZMA-compressed, recommended)
+   1.6.25rc02.tar.gz
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lpng1625.7z  (LZMA-compressed, recommended)
-   lpng1625.zip
+   lp1625r02.7z  (LZMA-compressed, recommended)
+   lp1625r02.zip
 
 Other information:
 
-   libpng-1.6.25-README.txt
-   libpng-1.6.25-LICENSE.txt
-   libpng-1.6.25-*.asc (armored detached GPG signatures)
+   1.6.25rc02-README.txt
+   1.6.25rc02-LICENSE.txt
+   libpng-1.6.25rc02-*.asc (armored detached GPG signatures)
 
 Changes since the last public release (1.6.24):
+
+Version 1.6.25beta01 [August 12, 2016]
   Reject oversized iCCP profile immediately.
   Cleaned up PNG_DEBUG compile of pngtest.c.
   Conditionally compile png_inflate().
+
+Version 1.6.25beta02 [August 18, 2016]
   Don't install pngcp; it conflicts with pngcp in the pngtools package.
   Minor editing of INSTALL, (whitespace, added copyright line)
-  Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>).
-  Rebased contrib/intel/intel_sse.patch after the MIPS implementation.
 
+Version 1.6.25rc01 [August 24, 2016]
+  No changes.
+
+Version 1.6.25rc02 [August 29, 2016]
+  Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>).
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
 to subscribe)

CHANGES

@@ -5689,19 +5689,6 @@ Version 1.6.25rc01 [August 24, 2016]
 
 Version 1.6.25rc02 [August 29, 2016]
   Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>).
-  Only the UP filter is currently implemented.
-
-Version 1.6.25rc03 [August 29, 2016]
-  Rebased contrib/intel/intel_sse.patch after the MIPS implementation.
-
-Version 1.6.25rc04 [August 30, 2016]
-  Added MIPS support for SUB, AVG, and PAETH filters (Mandar Sahastrabuddhe).
-
-Version 1.6.25rc05 [August 30, 2016]
-  Rebased contrib/intel/intel_sse.patch after the MIPS implementation update..
-
-Version 1.6.25 [September 1, 2016]
-  No changes.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit

CMakeLists.txt

@@ -696,7 +696,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
 # SET UP LINKS
 if(PNG_SHARED)
   set_target_properties(png PROPERTIES
-#   VERSION 16.${PNGLIB_RELEASE}.1.6.25
+#   VERSION 16.${PNGLIB_RELEASE}.1.6.25rc02
     VERSION 16.${PNGLIB_RELEASE}.0
     SOVERSION 16
     CLEAN_DIRECT_OUTPUT 1)

LICENSE

@@ -10,7 +10,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.25, September 1, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.25rc02, August 29, 2016 are
 Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
@@ -127,4 +127,4 @@ any encryption software.  See the EAR, paragraphs 734.3(b)(3) and
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-September 1, 2016
+August 29, 2016

Makefile.am

@@ -1,7 +1,7 @@
 # Makefile.am, the source file for Makefile.in (and hence Makefile), is
 #
 # Copyright (c) 2004-2016 Glenn Randers-Pehrson
-# Last changed in libpng 1.6.25 [September 1, 2016]
+# Last changed in libpng 1.6.25 [(PENDING RELEASE)]
 #
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer

README

@@ -1,4 +1,4 @@
-README for libpng version 1.6.25 - September 1, 2016 (shared library 16.0)
+README for libpng version 1.6.25rc02 - August 29, 2016 (shared library 16.0)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.

configure.ac

@@ -1,7 +1,7 @@
 # configure.ac
 
 # Copyright (c) 2004-2016 Glenn Randers-Pehrson
-# Last changed in libpng 1.6.25 [September 1, 2016]
+# Last changed in libpng 1.6.25 [(PENDING RELEASE)]
 
 # This code is released under the libpng license.
 # For conditions of distribution and use, see the disclaimer
@@ -25,7 +25,7 @@ AC_PREREQ([2.68])
 
 dnl Version number stuff here:
 
-AC_INIT([libpng],[1.6.25],[png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng],[1.6.25rc02],[png-mng-implement@lists.sourceforge.net])
 AC_CONFIG_MACRO_DIR([scripts])
 
 # libpng does not follow GNU file name conventions (hence 'foreign')
@@ -46,7 +46,7 @@ dnl automake, so the following is not necessary (and is not defined anyway):
 dnl AM_PREREQ([1.11.2])
 dnl stop configure from automagically running automake
 
-PNGLIB_VERSION=1.6.25
+PNGLIB_VERSION=1.6.25rc02
 PNGLIB_MAJOR=1
 PNGLIB_MINOR=6
 PNGLIB_RELEASE=25

contrib/intel/intel_sse.patch

@@ -1,13 +1,13 @@
 diff --git a/configure.ac b/configure.ac
---- a/configure.ac	2016-08-29 11:46:27.000000000 -0400
-+++ b/configure.ac	2016-08-29 16:57:03.866355018 -0400
-@@ -386,16 +386,51 @@ AC_ARG_ENABLE([mips-msa],
- # future host CPU does not match 'mips*')
+--- a/configure.ac	2016-05-25 18:59:10.000000000 -0400
++++ b/configure.ac	2016-05-25 19:48:10.631751170 -0400
+@@ -341,16 +341,50 @@ AC_ARG_ENABLE([arm-neon],
  
- AM_CONDITIONAL([PNG_MIPS_MSA],
-    [test "$enable_mips_msa" != 'no' &&
+ AM_CONDITIONAL([PNG_ARM_NEON],
+    [test "$enable_arm_neon" != 'no' &&
      case "$host_cpu" in
-       mipsel*|mips64el*) :;;
+       arm*|aarch64*) :;;
+       *)    test "$enable_arm_neon" != '';;
      esac])
  
 +# INTEL
@@ -44,7 +44,6 @@ diff --git a/configure.ac b/configure.ac
 +      i?86|x86_64) :;;
 +      *)    test "$enable_intel_sse" != '';;
 +    esac])
-+
  AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
  
  # Config files, substituting as above
@@ -54,22 +53,21 @@ diff --git a/configure.ac b/configure.ac
  
  AC_OUTPUT
 diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am	2016-08-29 11:46:27.000000000 -0400
-+++ b/Makefile.am	2016-08-29 16:57:45.955528215 -0400
-@@ -97,16 +97,21 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SO
- 	arm/filter_neon.S arm/filter_neon_intrinsics.c
- endif
+--- a/Makefile.am	2016-05-17 18:15:12.000000000 -0400
++++ b/Makefile.am	2016-05-25 19:48:10.631751170 -0400
+@@ -92,16 +92,20 @@ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SO
+ 	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
+ 	png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
  
- if PNG_MIPS_MSA
- libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += mips/mips_init.c\
- 	mips/filter_msa_intrinsics.c
+ if PNG_ARM_NEON
+ libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\
+ 	arm/filter_neon.S arm/filter_neon_intrinsics.c
  endif
  
 +if PNG_INTEL_SSE
 +libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += contrib/intel/intel_init.c\
 +    contrib/intel/filter_sse2_intrinsics.c
 +endif
-+
  nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
  
  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
@@ -79,16 +77,16 @@ diff --git a/Makefile.am b/Makefile.am
  #   Versioned symbols and restricted exports
  if HAVE_SOLARIS_LD
 diff --git a/pngpriv.h b/pngpriv.h
---- debug16/pngpriv.h	2016-08-30 10:46:36.000000000 -0400
-+++ libpng16/pngpriv.h	2016-08-30 11:57:25.672280202 -0400
-@@ -185,16 +185,52 @@
- #ifndef PNG_MIPS_MSA_OPT
- #  if defined(__mips_msa) && (__mips_isa_rev >= 5) && defined(PNG_ALIGNED_MEMORY_SUPPORTED)
- #     define PNG_MIPS_MSA_OPT 2
- #  else
- #     define PNG_MIPS_MSA_OPT 0
+--- a/pngpriv.h	2016-08-01 18:13:38.770128810 -0500
++++ b/pngpriv.h	2016-08-01 18:50:19.130179017 -0500
+@@ -177,16 +177,52 @@
+ #  endif /* !PNG_ARM_NEON_IMPLEMENTATION */
+ 
+ #  ifndef PNG_ARM_NEON_IMPLEMENTATION
+       /* Use the intrinsics code by default. */
+ #     define PNG_ARM_NEON_IMPLEMENTATION 1
  #  endif
- #endif
+ #endif /* PNG_ARM_NEON_OPT > 0 */
  
 +#ifndef PNG_INTEL_SSE_OPT
 +#   ifdef PNG_INTEL_SSE
@@ -126,23 +124,24 @@ diff --git a/pngpriv.h b/pngpriv.h
 +#   endif
 +#endif
 +
- #if PNG_MIPS_MSA_OPT > 0
- #  define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_msa
- #  ifndef PNG_MIPS_MSA_IMPLEMENTATION
- #     if defined(__mips_msa)
- #        if defined(__clang__)
- #        elif defined(__GNUC__)
- #           if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
- #              define PNG_MIPS_MSA_IMPLEMENTATION 2
-@@ -1232,16 +1268,31 @@ PNG_INTERNAL_FUNCTION(void,png_read_filt
- PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_msa,(png_row_infop
+ /* Is this a build of a DLL where compilation of the object modules requires
+  * different preprocessor settings to those required for a simple library?  If
+  * so PNG_BUILD_DLL must be set.
+  *
+  * If libpng is used inside a DLL but that DLL does not export the libpng APIs
+  * PNG_BUILD_DLL must not be set.  To avoid the code below kicking in build a
+  * static library of libpng then link the DLL against that.
+  */
+@@ -1185,16 +1221,31 @@ PNG_INTERNAL_FUNCTION(void,png_read_filt
      row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
- PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_msa,(png_row_infop
+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_neon,(png_row_infop
      row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
- PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_neon,(png_row_infop
+     row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
+ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
      row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
  #endif
- 
++ 
 +#if PNG_INTEL_SSE_IMPLEMENTATION > 0
 +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_sse2,(png_row_infop
 +    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
@@ -157,7 +156,7 @@ diff --git a/pngpriv.h b/pngpriv.h
 +PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_sse2,(png_row_infop
 +    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 +#endif
-+
+ 
  /* Choose the best filter to use and filter the row data */
  PNG_INTERNAL_FUNCTION(void,png_write_find_filter,(png_structrp png_ptr,
      png_row_infop row_info),PNG_EMPTY);
@@ -165,17 +164,15 @@ diff --git a/pngpriv.h b/pngpriv.h
  #ifdef PNG_SEQUENTIAL_READ_SUPPORTED
  PNG_INTERNAL_FUNCTION(void,png_read_IDAT_data,(png_structrp png_ptr,
     png_bytep output, png_alloc_size_t avail_out),PNG_EMPTY);
-    /* Read 'avail_out' bytes of data from the IDAT stream.  If the output buffer
-@@ -1967,16 +2018,21 @@ PNG_INTERNAL_FUNCTION(void, PNG_FILTER_O
+@@ -1916,16 +1967,20 @@ PNG_INTERNAL_FUNCTION(void, PNG_FILTER_O
+    /* List *all* the possible optimizations here - this branch is required if
+     * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in
+     * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing.
+     */
+ #  if PNG_ARM_NEON_OPT > 0
  PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon,
     (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
- #endif
- 
- #if PNG_MIPS_MSA_OPT > 0
- PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_msa,
-    (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
- #endif
-+
+ #  endif
 +#  if PNG_INTEL_SSE_IMPLEMENTATION > 0
 +PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2,
 +   (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);

libpng-manual.txt

@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.25 - September 1, 2016
+ libpng version 1.6.25rc02 - August 29, 2016
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.25 - September 1, 2016
+ libpng versions 0.97, January 1998, through 1.6.25rc02 - August 29, 2016
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
 
@@ -5350,7 +5350,7 @@ Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.25 are Y2K compliant.  It is my belief that earlier
+upward through 1.6.25rc02 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has two year fields.  One is a 2-byte unsigned integer

libpng.3

@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 1, 2016"
+.TH LIBPNG 3 "August 29, 2016"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25rc02
 .SH SYNOPSIS
 \fB
 #include <png.h>\fP
@@ -510,7 +510,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.25 - September 1, 2016
+ libpng version 1.6.25rc02 - August 29, 2016
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -521,7 +521,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.25 - September 1, 2016
+ libpng versions 0.97, January 1998, through 1.6.25rc02 - August 29, 2016
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2016 Glenn Randers-Pehrson
 
@@ -5860,7 +5860,7 @@ Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.25 are Y2K compliant.  It is my belief that earlier
+upward through 1.6.25rc02 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -6018,7 +6018,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.25 - September 1, 2016:
+Libpng version 1.6.25rc02 - August 29, 2016:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6043,7 +6043,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.0.7, July 1, 2000 through 1.6.25, September 1, 2016 are
+libpng versions 1.0.7, July 1, 2000 through 1.6.25rc02, August 29, 2016 are
 Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
 derived from libpng-1.0.6, and are distributed according to the same
 disclaimer and license as libpng-1.0.6 with the following individuals
@@ -6168,7 +6168,7 @@ files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-September 1, 2016
+August 29, 2016
 
 .\" end of man page
 

libpngpf.3

@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "September 1, 2016"
+.TH LIBPNGPF 3 "August 29, 2016"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.25rc02
 (private functions)
 .SH SYNOPSIS
 \fB#include \fI"pngpriv.h"

mips/filter_msa_intrinsics.c

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2016 Glenn Randers-Pehrson
  * Written by Mandar Sahastrabuddhe, August 2016.
- * Last changed in libpng 1.6.25 [September 1, 2016]
+ * Last changed in libpng 1.6.25 [(PENDING RELEASE)]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ -38,215 +38,6 @@
 
 #if PNG_MIPS_MSA_OPT > 0
 
-#ifdef CLANG_BUILD
-   #define MSA_SRLI_B(a, b)   __msa_srli_b((v16i8) a, b)
-
-   #define LW(psrc)                              \
-   ( {                                           \
-       uint8_t *psrc_lw_m = (uint8_t *) (psrc);  \
-       uint32_t val_m;                           \
-                                                 \
-       asm volatile (                            \
-           "lw  %[val_m],  %[psrc_lw_m]  \n\t"   \
-                                                 \
-           : [val_m] "=r" (val_m)                \
-           : [psrc_lw_m] "m" (*psrc_lw_m)        \
-       );                                        \
-                                                 \
-       val_m;                                    \
-   } )
-
-   #define SH(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sh_m = (uint8_t *) (pdst);  \
-       uint16_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sh  %[val_m],  %[pdst_sh_m]  \n\t"   \
-                                                 \
-           : [pdst_sh_m] "=m" (*pdst_sh_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SW(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sw_m = (uint8_t *) (pdst);  \
-       uint32_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sw  %[val_m],  %[pdst_sw_m]  \n\t"   \
-                                                 \
-           : [pdst_sw_m] "=m" (*pdst_sw_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-       #if (__mips == 64)
-        #define SD(val, pdst)                         \
-        {                                             \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);  \
-            uint64_t val_m = (val);                   \
-                                                      \
-            asm volatile (                            \
-                "sd  %[val_m],  %[pdst_sd_m]  \n\t"   \
-                                                      \
-                : [pdst_sd_m] "=m" (*pdst_sd_m)       \
-                : [val_m] "r" (val_m)                 \
-            );                                        \
-        }
-    #else
-        #define SD(val, pdst)                                          \
-        {                                                              \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);                   \
-            uint32_t val0_m, val1_m;                                   \
-                                                                       \
-            val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF);          \
-            val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF);  \
-                                                                       \
-            SW(val0_m, pdst_sd_m);                                     \
-            SW(val1_m, pdst_sd_m + 4);                                 \
-        }
-    #endif
-#else
-   #define MSA_SRLI_B(a, b)   (a >> b)
-
-#if (__mips_isa_rev >= 6)
-   #define LW(psrc)                              \
-   ( {                                           \
-       uint8_t *psrc_lw_m = (uint8_t *) (psrc);  \
-       uint32_t val_m;                           \
-                                                 \
-       asm volatile (                            \
-           "lw  %[val_m],  %[psrc_lw_m]  \n\t"   \
-                                                 \
-           : [val_m] "=r" (val_m)                \
-           : [psrc_lw_m] "m" (*psrc_lw_m)        \
-       );                                        \
-                                                 \
-       val_m;                                    \
-   } )
-
-   #define SH(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sh_m = (uint8_t *) (pdst);  \
-       uint16_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sh  %[val_m],  %[pdst_sh_m]  \n\t"   \
-                                                 \
-           : [pdst_sh_m] "=m" (*pdst_sh_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SW(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sw_m = (uint8_t *) (pdst);  \
-       uint32_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "sw  %[val_m],  %[pdst_sw_m]  \n\t"   \
-                                                 \
-           : [pdst_sw_m] "=m" (*pdst_sw_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #if (__mips == 64)
-        #define SD(val, pdst)                         \
-        {                                             \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);  \
-            uint64_t val_m = (val);                   \
-                                                      \
-            asm volatile (                            \
-                "sd  %[val_m],  %[pdst_sd_m]  \n\t"   \
-                                                      \
-                : [pdst_sd_m] "=m" (*pdst_sd_m)       \
-                : [val_m] "r" (val_m)                 \
-            );                                        \
-        }
-    #else
-        #define SD(val, pdst)                                          \
-        {                                                              \
-            uint8_t *pdst_sd_m = (uint8_t *) (pdst);                   \
-            uint32_t val0_m, val1_m;                                   \
-                                                                       \
-            val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF);          \
-            val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF);  \
-                                                                       \
-            SW(val0_m, pdst_sd_m);                                     \
-            SW(val1_m, pdst_sd_m + 4);                                 \
-        }
-    #endif
-#else  // !(__mips_isa_rev >= 6)
-   #define LW(psrc)                              \
-   ( {                                           \
-       uint8_t *psrc_lw_m = (uint8_t *) (psrc);  \
-       uint32_t val_m;                           \
-                                                 \
-       asm volatile (                            \
-           "ulw  %[val_m],  %[psrc_lw_m]  \n\t"  \
-                                                 \
-           : [val_m] "=r" (val_m)                \
-           : [psrc_lw_m] "m" (*psrc_lw_m)        \
-       );                                        \
-                                                 \
-       val_m;                                    \
-   } )
-
-   #define SH(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sh_m = (uint8_t *) (pdst);  \
-       uint16_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "ush  %[val_m],  %[pdst_sh_m]  \n\t"  \
-                                                 \
-           : [pdst_sh_m] "=m" (*pdst_sh_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SW(val, pdst)                         \
-   {                                             \
-       uint8_t *pdst_sw_m = (uint8_t *) (pdst);  \
-       uint32_t val_m = (val);                   \
-                                                 \
-       asm volatile (                            \
-           "usw  %[val_m],  %[pdst_sw_m]  \n\t"  \
-                                                 \
-           : [pdst_sw_m] "=m" (*pdst_sw_m)       \
-           : [val_m] "r" (val_m)                 \
-       );                                        \
-   }
-
-   #define SD(val, pdst)                                          \
-    {                                                              \
-        uint8_t *pdst_sd_m = (uint8_t *) (pdst);                   \
-        uint32_t val0_m, val1_m;                                   \
-                                                                   \
-        val0_m = (uint32_t) ((val) & 0x00000000FFFFFFFF);          \
-        val1_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF);  \
-                                                                   \
-        SW(val0_m, pdst_sd_m);                                     \
-        SW(val1_m, pdst_sd_m + 4);                                 \
-    }
-
-    #define SW_ZERO(pdst)                      \
-    {                                          \
-        uint8_t *pdst_m = (uint8_t *) (pdst);  \
-                                               \
-        asm volatile (                         \
-            "usw  $0,  %[pdst_m]  \n\t"        \
-                                               \
-            : [pdst_m] "=m" (*pdst_m)          \
-            :                                  \
-        );                                     \
-    }
-#endif  // (__mips_isa_rev >= 6)
-#endif
-
 #define LD_B(RTYPE, psrc) *((RTYPE *) (psrc))
 #define LD_UB(...) LD_B(v16u8, __VA_ARGS__)
 #define LD_B2(RTYPE, psrc, stride, out0, out1)  \
@@ -295,74 +86,6 @@
     ADD2(in4, in5, in6, in7, out2, out3);             \
 }
 
-#define ILVR_B2(RTYPE, in0, in1, in2, in3, out0, out1)      \
-{                                                           \
-    out0 = (RTYPE) __msa_ilvr_b((v16i8) in0, (v16i8) in1);  \
-    out1 = (RTYPE) __msa_ilvr_b((v16i8) in2, (v16i8) in3);  \
-}
-#define ILVR_B2_SH(...) ILVR_B2(v8i16, __VA_ARGS__)
-
-#define HSUB_UB2(RTYPE, in0, in1, out0, out1)                 \
-{                                                             \
-    out0 = (RTYPE) __msa_hsub_u_h((v16u8) in0, (v16u8) in0);  \
-    out1 = (RTYPE) __msa_hsub_u_h((v16u8) in1, (v16u8) in1);  \
-}
-#define HSUB_UB2_SH(...) HSUB_UB2(v8i16, __VA_ARGS__)
-
-#define SLDI_B2_0(RTYPE, in0, in1, out0, out1, slide_val)                 \
-{                                                                         \
-    v16i8 zero_m = { 0 };                                                 \
-    out0 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in0, slide_val);  \
-    out1 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in1, slide_val);  \
-}
-#define SLDI_B2_0_UB(...) SLDI_B2_0(v16u8, __VA_ARGS__)
-
-#define SLDI_B3_0(RTYPE, in0, in1, in2, out0, out1, out2,  slide_val)     \
-{                                                                         \
-    v16i8 zero_m = { 0 };                                                 \
-    SLDI_B2_0(RTYPE, in0, in1, out0, out1, slide_val);                    \
-    out2 = (RTYPE) __msa_sldi_b((v16i8) zero_m, (v16i8) in2, slide_val);  \
-}
-#define SLDI_B3_0_UB(...) SLDI_B3_0(v16u8, __VA_ARGS__)
-
-#define ILVEV_W2(RTYPE, in0, in1, in2, in3, out0, out1)      \
-{                                                            \
-    out0 = (RTYPE) __msa_ilvev_w((v4i32) in1, (v4i32) in0);  \
-    out1 = (RTYPE) __msa_ilvev_w((v4i32) in3, (v4i32) in2);  \
-}
-#define ILVEV_W2_UB(...) ILVEV_W2(v16u8, __VA_ARGS__)
-
-#define ADD_ABS_H3(RTYPE, in0, in1, in2, out0, out1, out2)  \
-{                                                           \
-    RTYPE zero = {0};                                       \
-                                                            \
-    out0 = __msa_add_a_h((v8i16) zero, in0);                \
-    out1 = __msa_add_a_h((v8i16) zero, in1);                \
-    out2 = __msa_add_a_h((v8i16) zero, in2);                \
-}
-#define ADD_ABS_H3_SH(...) ADD_ABS_H3(v8i16, __VA_ARGS__)
-
-#define VSHF_B2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1)       \
-{                                                                          \
-    out0 = (RTYPE) __msa_vshf_b((v16i8) mask0, (v16i8) in1, (v16i8) in0);  \
-    out1 = (RTYPE) __msa_vshf_b((v16i8) mask1, (v16i8) in3, (v16i8) in2);  \
-}
-#define VSHF_B2_UB(...) VSHF_B2(v16u8, __VA_ARGS__)
-
-#define CMP_AND_SELECT(inp0, inp1, inp2, inp3, inp4, inp5, out0)              \
-{                                                                             \
-   v8i16 _sel_h0, _sel_h1;                                                    \
-   v16u8 _sel_b0, _sel_b1;                                                    \
-   _sel_h0 = (v8i16) __msa_clt_u_h((v8u16) inp1, (v8u16) inp0);               \
-   _sel_b0 = (v16u8) __msa_pckev_b((v16i8) _sel_h0, (v16i8) _sel_h0);         \
-   inp0 = (v8i16) __msa_bmnz_v((v16u8) inp0, (v16u8) inp1, (v16u8) _sel_h0);  \
-   inp4 = (v16u8) __msa_bmnz_v(inp3, inp4, _sel_b0);                          \
-   _sel_h1 = (v8i16) __msa_clt_u_h((v8u16) inp2, (v8u16) inp0);               \
-   _sel_b1 = (v16u8) __msa_pckev_b((v16i8) _sel_h1, (v16i8) _sel_h1);         \
-   inp4 = (v16u8) __msa_bmnz_v(inp4, inp5, _sel_b1);                          \
-   out0 += inp4;                                                              \
-}
-
 void png_read_filter_row_up_msa(png_row_infop row_info, png_bytep row,
                                 png_const_bytep prev_row)
 {
@@ -454,354 +177,6 @@ void png_read_filter_row_up_msa(png_row_infop row_info, png_bytep row,
    }
 }
 
-void png_read_filter_row_sub4_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t count;
-   png_size_t istop = row_info->rowbytes;
-   png_bytep src = row;
-   png_bytep nxt = row + 4;
-   int32_t inp0;
-   v16u8 src0, src1, src2, src3, src4;
-   v16u8 dst0, dst1;
-   v16u8 zero = { 0 };
-
-   istop -= 4;
-
-   inp0 = LW(src);
-   src += 4;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-
-   for (count = 0; count < istop; count += 16)
-   {
-      src1 = LD_UB(src);
-      src += 16;
-
-      src2 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 4);
-      src3 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 8);
-      src4 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 12);
-      src1 += src0;
-      src2 += src1;
-      src3 += src2;
-      src4 += src3;
-      src0 = src4;
-      ILVEV_W2_UB(src1, src2, src3, src4, dst0, dst1);
-      dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
-
-      ST_UB(dst0, nxt);
-      nxt += 16;
-   }
-}
-
-void png_read_filter_row_sub3_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t count;
-   png_size_t istop = row_info->rowbytes;
-   png_bytep src = row;
-   png_bytep nxt = row + 3;
-   int64_t out0;
-   int32_t inp0, out1;
-   v16u8 src0, src1, src2, src3, src4, dst0, dst1;
-   v16u8 zero = { 0 };
-   v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
-
-   istop -= 3;
-
-   inp0 = LW(src);
-   src += 3;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-
-   for (count = 0; count < istop; count += 12)
-   {
-      src1 = LD_UB(src);
-      src += 12;
-
-      src2 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 3);
-      src3 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 6);
-      src4 = (v16u8) __msa_sldi_b((v16i8) zero, (v16i8) src1, 9);
-      src1 += src0;
-      src2 += src1;
-      src3 += src2;
-      src4 += src3;
-      src0 = src4;
-      VSHF_B2_UB(src1, src2, src3, src4, mask0, mask0, dst0, dst1);
-      dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
-      out0 = __msa_copy_s_d((v2i64) dst0, 0);
-      out1 = __msa_copy_s_w((v4i32) dst0, 2);
-
-      SD(out0, nxt);
-      nxt += 8;
-      SW(out1, nxt);
-      nxt += 4;
-   }
-}
-
-void png_read_filter_row_avg4_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_bytep src = row;
-   png_bytep nxt = row;
-   png_const_bytep pp = prev_row;
-   png_size_t istop = row_info->rowbytes - 4;
-   int32_t inp0, inp1, out0;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
-   v16u8 zero = { 0 };
-
-   inp0 = LW(pp);
-   pp += 4;
-   inp1 = LW(src);
-   src += 4;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-   src0 = (v16u8) MSA_SRLI_B(src0, 1);
-   src1 += src0;
-   out0 = __msa_copy_s_w((v4i32) src1, 0);
-   SW(out0, nxt);
-   nxt += 4;
-
-   for (i = 0; i < istop; i += 16)
-   {
-      src2 = LD_UB(pp);
-      pp += 16;
-      src6 = LD_UB(src);
-      src += 16;
-
-      SLDI_B2_0_UB(src2, src6, src3, src7, 4);
-      SLDI_B2_0_UB(src2, src6, src4, src8, 8);
-      SLDI_B2_0_UB(src2, src6, src5, src9, 12);
-      src2 = __msa_ave_u_b(src2, src1);
-      src6 += src2;
-      src3 = __msa_ave_u_b(src3, src6);
-      src7 += src3;
-      src4 = __msa_ave_u_b(src4, src7);
-      src8 += src4;
-      src5 = __msa_ave_u_b(src5, src8);
-      src9 += src5;
-      src1 = src9;
-      ILVEV_W2_UB(src6, src7, src8, src9, dst0, dst1);
-      dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
-
-      ST_UB(dst0, nxt);
-      nxt += 16;
-   }
-}
-
-void png_read_filter_row_avg3_msa(png_row_infop row_info, png_bytep row,
-                                  png_const_bytep prev_row)
-{
-   png_size_t i;
-   png_bytep src = row;
-   png_bytep nxt = row;
-   png_const_bytep pp = prev_row;
-   png_size_t istop = row_info->rowbytes - 3;
-   int64_t out0;
-   int32_t inp0, inp1, out1;
-   int16_t out2;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
-   v16u8 zero = { 0 };
-   v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
-
-   inp0 = LW(pp);
-   pp += 3;
-   inp1 = LW(src);
-   src += 3;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-   src0 = (v16u8) MSA_SRLI_B(src0, 1);
-   src1 += src0;
-   out2 = __msa_copy_s_h((v8i16) src1, 0);
-   SH(out2, nxt);
-   nxt += 2;
-   nxt[0] = src1[2];
-   nxt++;
-
-   for (i = 0; i < istop; i += 12)
-   {
-      src2 = LD_UB(pp);
-      pp += 12;
-      src6 = LD_UB(src);
-      src += 12;
-
-      SLDI_B2_0_UB(src2, src6, src3, src7, 3);
-      SLDI_B2_0_UB(src2, src6, src4, src8, 6);
-      SLDI_B2_0_UB(src2, src6, src5, src9, 9);
-      src2 = __msa_ave_u_b(src2, src1);
-      src6 += src2;
-      src3 = __msa_ave_u_b(src3, src6);
-      src7 += src3;
-      src4 = __msa_ave_u_b(src4, src7);
-      src8 += src4;
-      src5 = __msa_ave_u_b(src5, src8);
-      src9 += src5;
-      src1 = src9;
-      VSHF_B2_UB(src6, src7, src8, src9, mask0, mask0, dst0, dst1);
-      dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
-      out0 = __msa_copy_s_d((v2i64) dst0, 0);
-      out1 = __msa_copy_s_w((v4i32) dst0, 2);
-
-      SD(out0, nxt);
-      nxt += 8;
-      SW(out1, nxt);
-      nxt += 4;
-   }
-}
-
-void png_read_filter_row_paeth4_msa(png_row_infop row_info,
-                                    png_bytep row,
-                                    png_const_bytep prev_row)
-{
-   int32_t count, rp_end;
-   png_bytep nxt;
-   png_const_bytep prev_nxt;
-   int32_t inp0, inp1, res0;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9;
-   v16u8 src10, src11, src12, src13, dst0, dst1;
-   v8i16 vec0, vec1, vec2;
-   v16u8 zero = { 0 };
-
-   nxt = row;
-   prev_nxt = prev_row;
-
-   inp0 = LW(nxt);
-   inp1 = LW(prev_nxt);
-   prev_nxt += 4;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-
-   src1 += src0;
-   res0 = __msa_copy_s_w((v4i32) src1, 0);
-
-   SW(res0, nxt);
-   nxt += 4;
-
-   /* Remainder */
-   rp_end = row_info->rowbytes - 4;
-
-   for (count = 0; count < rp_end; count += 16)
-   {
-      src2 = LD_UB(prev_nxt);
-      prev_nxt += 16;
-      src6 = LD_UB(prev_row);
-      prev_row += 16;
-      src10 = LD_UB(nxt);
-
-      SLDI_B3_0_UB(src2, src6, src10, src3, src7, src11, 4);
-      SLDI_B3_0_UB(src2, src6, src10, src4, src8, src12, 8);
-      SLDI_B3_0_UB(src2, src6, src10, src5, src9, src13, 12);
-      ILVR_B2_SH(src2, src6, src1, src6, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src1, src2, src6, src10);
-      ILVR_B2_SH(src3, src7, src10, src7, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src10, src3, src7, src11);
-      ILVR_B2_SH(src4, src8, src11, src8, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src11, src4, src8, src12);
-      ILVR_B2_SH(src5, src9, src12, src9, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src12, src5, src9, src13);
-      src1 = src13;
-      ILVEV_W2_UB(src10, src11, src12, src1, dst0, dst1);
-      dst0 = (v16u8) __msa_pckev_d((v2i64) dst1, (v2i64) dst0);
-
-      ST_UB(dst0, nxt);
-      nxt += 16;
-   }
-}
-
-void png_read_filter_row_paeth3_msa(png_row_infop row_info,
-                                    png_bytep row,
-                                    png_const_bytep prev_row)
-{
-   int32_t count, rp_end;
-   png_bytep nxt;
-   png_const_bytep prev_nxt;
-   int64_t out0;
-   int32_t inp0, inp1, out1;
-   int16_t out2;
-   v16u8 src0, src1, src2, src3, src4, src5, src6, src7, src8, src9, dst0, dst1;
-   v16u8 src10, src11, src12, src13;
-   v8i16 vec0, vec1, vec2;
-   v16u8 zero = { 0 };
-   v16i8 mask0 = { 0, 1, 2, 16, 17, 18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-   v16i8 mask1 = { 0, 1, 2, 3, 4, 5, 16, 17, 18, 19, 20, 21, 0, 0, 0, 0 };
-
-   nxt = row;
-   prev_nxt = prev_row;
-
-   inp0 = LW(nxt);
-   inp1 = LW(prev_nxt);
-   prev_nxt += 3;
-   src0 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp0);
-   src1 = (v16u8) __msa_insert_w((v4i32) zero, 0, inp1);
-
-   src1 += src0;
-   out2 = __msa_copy_s_h((v8i16) src1, 0);
-
-   SH(out2, nxt);
-   nxt += 2;
-   nxt[0] = src1[2];
-   nxt++;
-
-   /* Remainder */
-   rp_end = row_info->rowbytes - 3;
-
-   for (count = 0; count < rp_end; count += 12)
-   {
-      src2 = LD_UB(prev_nxt);
-      prev_nxt += 12;
-      src6 = LD_UB(prev_row);
-      prev_row += 12;
-      src10 = LD_UB(nxt);
-
-      SLDI_B3_0_UB(src2, src6, src10, src3, src7, src11, 3);
-      SLDI_B3_0_UB(src2, src6, src10, src4, src8, src12, 6);
-      SLDI_B3_0_UB(src2, src6, src10, src5, src9, src13, 9);
-      ILVR_B2_SH(src2, src6, src1, src6, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src1, src2, src6, src10);
-      ILVR_B2_SH(src3, src7, src10, src7, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src10, src3, src7, src11);
-      ILVR_B2_SH(src4, src8, src11, src8, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src11, src4, src8, src12);
-      ILVR_B2_SH(src5, src9, src12, src9, vec0, vec1);
-      HSUB_UB2_SH(vec0, vec1, vec0, vec1);
-      vec2 = vec0 + vec1;
-      ADD_ABS_H3_SH(vec0, vec1, vec2, vec0, vec1, vec2);
-      CMP_AND_SELECT(vec0, vec1, vec2, src12, src5, src9, src13);
-      src1 = src13;
-      VSHF_B2_UB(src10, src11, src12, src13, mask0, mask0, dst0, dst1);
-      dst0 = (v16u8) __msa_vshf_b(mask1, (v16i8) dst1, (v16i8) dst0);
-      out0 = __msa_copy_s_d((v2i64) dst0, 0);
-      out1 = __msa_copy_s_w((v4i32) dst0, 2);
-
-      SD(out0, nxt);
-      nxt += 8;
-      SW(out1, nxt);
-      nxt += 4;
-   }
-}
-
 #endif /* PNG_MIPS_MSA_OPT > 0 */
 #endif /* PNG_MIPS_MSA_IMPLEMENTATION == 1 (intrinsics) */
 #endif /* READ */

mips/mips_init.c

@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2016 Glenn Randers-Pehrson
  * Written by Mandar Sahastrabuddhe, 2016.
- * Last changed in libpng 1.6.25 [September 1, 2016]
+ * Last changed in libpng 1.6.25 [(PENDING RELEASE)]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ -110,20 +110,6 @@ png_init_filter_functions_msa(png_structp pp, unsigned int bpp)
     * initialization function.)
     */
    pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_msa;
-
-   if (bpp == 3)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_msa;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_msa;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth3_msa;
-   }
-
-   else if (bpp == 4)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_msa;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_msa;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] = png_read_filter_row_paeth4_msa;
-   }
 }
 #endif /* PNG_MIPS_MSA_OPT > 0 */
 #endif /* READ */

png.5

@@ -1,4 +1,4 @@
-.TH PNG 5 "September 1, 2016"
+.TH PNG 5 "August 29, 2016"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

png.c

@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.6.25 [September 1, 2016]
+ * Last changed in libpng 1.6.25 [(PENDING RELEASE)]
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -14,7 +14,7 @@
 #include "pngpriv.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_25 Your_png_h_is_not_version_1_6_25;
+typedef png_libpng_version_1_6_25rc02 Your_png_h_is_not_version_1_6_25rc02;
 
 /* Tells libpng that we have already handled the first "num_bytes" bytes
  * of the PNG file signature.  If the PNG data is embedded into another
@@ -775,14 +775,14 @@ png_get_copyright(png_const_structrp png_ptr)
 #else
 #  ifdef __STDC__
    return PNG_STRING_NEWLINE \
-      "libpng version 1.6.25 - September 1, 2016" PNG_STRING_NEWLINE \
+      "libpng version 1.6.25rc02 - August 29, 2016" PNG_STRING_NEWLINE \
       "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \
       PNG_STRING_NEWLINE \
       "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
       "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
       PNG_STRING_NEWLINE;
 #  else
-   return "libpng version 1.6.25 - September 1, 2016\
+   return "libpng version 1.6.25rc02 - August 29, 2016\
       Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

png.h

@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.6.25, September 1, 2016
+ * libpng version 1.6.25rc02, August 29, 2016
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -12,7 +12,7 @@
  * Authors and maintainers:
  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- *   libpng versions 0.97, January 1998, through 1.6.25, September 1, 2016:
+ *   libpng versions 0.97, January 1998, through 1.6.25rc02, August 29, 2016:
  *     Glenn Randers-Pehrson.
  *   See also "Contributing Authors", below.
  */
@@ -29,7 +29,7 @@
  * files that are distributed with libpng have other copyright owners and
  * are released under other open source licenses.
  *
- * libpng versions 1.0.7, July 1, 2000 through 1.6.25, September 1, 2016 are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.25rc02, August 29, 2016 are
  * Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
  * derived from libpng-1.0.6, and are distributed according to the same
  * disclaimer and license as libpng-1.0.6 with the following individuals
@@ -246,13 +246,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    September 1, 2016
+ *    August 29, 2016
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.6.25 are Y2K compliant.  It is my belief that
+ *    upward through 1.6.25rc02 are Y2K compliant.  It is my belief that
  *    earlier versions were also Y2K compliant.
  *
  *    Libpng only has two year fields.  One is a 2-byte unsigned integer
@@ -314,8 +314,8 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.25"
-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25 - September 1, 2016\n"
+#define PNG_LIBPNG_VER_STRING "1.6.25rc02"
+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25rc02 - August 29, 2016\n"
 
 #define PNG_LIBPNG_VER_SONUM   16
 #define PNG_LIBPNG_VER_DLLNUM  16
@@ -329,7 +329,7 @@
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
 
-#define PNG_LIBPNG_VER_BUILD  0
+#define PNG_LIBPNG_VER_BUILD  02
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -346,7 +346,7 @@
 #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
                                        PNG_LIBPNG_BUILD_PRIVATE */
 
-#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
+#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC
 
 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
  * We must not include leading zeros.
@@ -464,7 +464,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-typedef char* png_libpng_version_1_6_25;
+typedef char* png_libpng_version_1_6_25rc02;
 
 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.
  *

pngconf.h

@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.6.25, September 1, 2016
+ * libpng version 1.6.25rc02, August 29, 2016
  *
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

pngpriv.h

@@ -1,7 +1,7 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * Last changed in libpng 1.6.25 [September 1, 2016]
+ * Last changed in libpng 1.6.25 [(PENDING RELEASE)]
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -1223,18 +1223,6 @@ PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_neon,(png_row_infop
 #if PNG_MIPS_MSA_OPT > 0
 PNG_INTERNAL_FUNCTION(void,png_read_filter_row_up_msa,(png_row_infop row_info,
     png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_sub4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_avg4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth3_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
-PNG_INTERNAL_FUNCTION(void,png_read_filter_row_paeth4_msa,(png_row_infop
-    row_info, png_bytep row, png_const_bytep prev_row),PNG_EMPTY);
 #endif
 
 /* Choose the best filter to use and filter the row data */

pngrutil.c

@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * Last changed in libpng 1.6.25 [September 1, 2016]
+ * Last changed in libpng 1.6.25 [(PENDING RELEASE)]
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)

pngtest.c

@@ -1,7 +1,7 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * Last changed in libpng 1.6.25 [September 1, 2016]
+ * Last changed in libpng 1.6.25 [(PENDING RELEASE)]
  * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -2088,4 +2088,4 @@ main(void)
 #endif
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_25 Your_png_h_is_not_version_1_6_25;
+typedef png_libpng_version_1_6_25rc02 Your_png_h_is_not_version_1_6_25rc02;

projects/vstudio/README.txt

@@ -1,7 +1,7 @@
 
 VisualStudio instructions
 
-libpng version 1.6.25 - September 1, 2016
+libpng version 1.6.25rc02 - August 29, 2016
 
 Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
 

projects/vstudio/zlib.props

@@ -2,7 +2,7 @@
 <!--
  * zlib.props - location of zlib source
  *
- * libpng version 1.6.25 - September 1, 2016
+ * libpng version 1.6.25rc02 - August 29, 2016
  *
  * Copyright (c) 1998-2011 Glenn Randers-Pehrson
  *

scripts/README.txt

@@ -1,9 +1,9 @@
 
-Makefiles for  libpng version 1.6.25 - September 1, 2016
+Makefiles for  libpng version 1.6.25rc02 - August 29, 2016
 
 pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.linux    =>  Linux/ELF makefile
-                       (gcc, creates libpng16.so.16.1.6.25)
+                       (gcc, creates libpng16.so.16.1.6.25rc02)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
                        ansi2knr (Requires ansi2knr.c from
@@ -33,12 +33,12 @@ pnglibconf.h.prebuilt       =>  Stores configuration settings
  makefile.os2      =>  OS/2 Makefile (gcc and emx, requires libpng.def)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.sggcc    =>  Silicon Graphics (gcc,
-                       creates libpng16.so.16.1.6.25)
+                       creates libpng16.so.16.1.6.25rc02)
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
  makefile.solaris  =>  Solaris 2.X makefile (gcc,
-                       creates libpng16.so.16.1.6.25)
+                       creates libpng16.so.16.1.6.25rc02)
  makefile.so9      =>  Solaris 9 makefile (gcc,
-                       creates libpng16.so.16.1.6.25)
+                       creates libpng16.so.16.1.6.25rc02)
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
  makefile.sunos    =>  Sun makefile
  makefile.32sunu   =>  Sun Ultra 32-bit makefile

scripts/def.c

@@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library""
 PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
 PNG_DFN ""
 PNG_DFN "EXPORTS"
-PNG_DFN ";Version 1.6.25"
+PNG_DFN ";Version 1.6.25rc02"
 
 #define PNG_EXPORTA(ordinal, type, name, args, attributes)\
         PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"

scripts/libpng-config-head.in

@@ -11,7 +11,7 @@
 
 # Modeled after libxml-config.
 
-version=1.6.25
+version=1.6.25rc02
 prefix=""
 libdir=""
 libs=""

scripts/libpng.pc.in

@@ -5,6 +5,6 @@ includedir=@includedir@/libpng16
 
 Name: libpng
 Description: Loads and saves PNG files
-Version: 1.6.25
+Version: 1.6.25rc02
 Libs: -L${libdir} -lpng16
 Cflags: -I${includedir}

scripts/makefile.ne12bsd

@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16
 
 LIB=	png16
 SHLIB_MAJOR=	0
-SHLIB_MINOR=	1.6.25
+SHLIB_MINOR=	1.6.25rc02
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c

scripts/makefile.netbsd

@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
 
 LIB=	png
 SHLIB_MAJOR=	16
-SHLIB_MINOR=	1.6.25
+SHLIB_MINOR=	1.6.25rc02
 SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
 	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
 	pngwtran.c pngmem.c pngerror.c pngpread.c

scripts/makefile.openbsd

@@ -11,7 +11,7 @@ LIBDIR=	${PREFIX}/lib
 MANDIR= ${PREFIX}/man/cat
 
 SHLIB_MAJOR=	16
-SHLIB_MINOR=	1.6.25
+SHLIB_MINOR=	1.6.25rc02
 
 LIB=	png
 SRCS=	png.c pngerror.c pngget.c pngmem.c pngpread.c \

scripts/pnglibconf.h.prebuilt

@@ -1,8 +1,8 @@
-/* libpng 1.6.25 STANDARD API DEFINITION */
+/* libpng 1.6.25rc02 STANDARD API DEFINITION */
 
 /* pnglibconf.h - library build configuration */
 
-/* Libpng version 1.6.25 - September 1, 2016 */
+/* Libpng version 1.6.25rc02 - August 29, 2016 */
 
 /* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
 

scripts/symbols.def

@@ -1,4 +1,4 @@
-;Version 1.6.25
+;Version 1.6.25rc02
 ;--------------------------------------------------------------
 ; LIBPNG symbol list as a Win32 DEF file
 ; Contains all the symbols that can be exported from libpng