From 6d5c56b44d1821a715f4496668373ac6d1f1d3c6 Mon Sep 17 00:00:00 2001 From: thestig Date: Wed, 3 Aug 2016 16:29:18 -0700 Subject: Update libpng to 1.6.22. Sync up with Chromium's copy of libpng. Review-Url: https://codereview.chromium.org/2132263002 --- third_party/third_party.gyp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'third_party/third_party.gyp') diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index fae4c8f1f4..caa5bb1af4 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -292,6 +292,36 @@ 'libpng16/pngwtran.c', 'libpng16/pngwutil.c', ], + 'msvs_disabled_warnings': [ + 4146, # Unary minus applied to unsigned type. + # Warnings about conversion from 'size_t' to 'long', possible loss of + # data. + 4267, + ], + 'conditions': [ + # SSE optimizations + [ 'target_arch=="ia32" or target_arch=="x64"', { + 'defines': [ + 'PNG_INTEL_SSE_OPT=1', + ], + 'sources': [ + 'libpng16/contrib/intel/intel_init.c', + 'libpng16/contrib/intel/filter_sse2_intrinsics.c', + ], + }], + + # ARM optimizations + [ '(target_arch=="arm" or target_arch=="arm64") and OS!="ios" and arm_neon==1', { + 'defines': [ + 'PNG_ARM_NEON_OPT=2', + 'PNG_ARM_NEON_IMPLEMENTATION=1', + ], + 'sources': [ + 'libpng16/arm/arm_init.c', + 'libpng16/arm/filter_neon_intrinsics.c', + ], + }], + ], }, { 'target_name': 'fx_zlib', -- cgit v1.2.3