cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Imported from libpng-1.6.25rc03.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2016-08-29 16:05:11 -05:00
parent 000f07bfbe
commit 0a2d496d58
3 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ANNOUNCE
View File

@ -41,6 +41,7 @@ Version 1.6.25rc02 [August 29, 2016]
Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>). Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>).
Version 1.6.25rc03 [August 29, 2016] Version 1.6.25rc03 [August 29, 2016]
Rebased contrib/intel/intel_sse.patch after the MIPS implementation.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

1
CHANGES
View File

@ -5691,6 +5691,7 @@ Version 1.6.25rc02 [August 29, 2016]
Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>). Added MIPS support (Mandar Sahastrabuddhe <Mandar.Sahastrabuddhe@imgtec.com>).
Version 1.6.25rc03 [August 29, 2016] Version 1.6.25rc03 [August 29, 2016]
Rebased contrib/intel/intel_sse.patch after the MIPS implementation.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

99
contrib/intel/intel_sse.patch
View File

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