summaryrefslogtreecommitdiff
path: root/third_party/third_party.gyp
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-08-03 16:29:18 -0700
committerCommit bot <commit-bot@chromium.org>2016-08-03 16:29:18 -0700
commit6d5c56b44d1821a715f4496668373ac6d1f1d3c6 (patch)
tree8eea2b264c779be6c35ddaa33f1496dd73300167 /third_party/third_party.gyp
parent96a07863120273c8b89cba0e7d53ef29ae56d580 (diff)
downloadpdfium-6d5c56b44d1821a715f4496668373ac6d1f1d3c6.tar.xz
Update libpng to 1.6.22.
Sync up with Chromium's copy of libpng. Review-Url: https://codereview.chromium.org/2132263002
Diffstat (limited to 'third_party/third_party.gyp')
-rw-r--r--third_party/third_party.gyp30
1 files changed, 30 insertions, 0 deletions
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',