diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2018-09-05 18:37:28 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-05 18:37:28 +0000 |
| commit | cc5f350ab9c825884424faaacc2fa3c403615220 (patch) | |
| tree | b415f4213a39c9e60899fbc07073c6f7e0d87558 /third_party/libpng16/arm/filter_neon.S | |
| parent | 424621e3129f7029283f72e953fe0c69f982d257 (diff) | |
| download | pdfium-cc5f350ab9c825884424faaacc2fa3c403615220.tar.xz | |
Update libpng from 1.6.22 -> 1.6.34
Updates third_party/libpng16 to Chromium's third_party/libpng @
a0e5c6a798a45a0dca175e2774ae0edc6aafc696 and applies PDFium specific
patches.
Originally landed as https://pdfium-review.googlesource.com/41910, but
reverted.
Bug=chromium:880322
Change-Id: Ib8249cb156135d028c02f67f9559bdd8695c04f5
Reviewed-on: https://pdfium-review.googlesource.com/42030
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'third_party/libpng16/arm/filter_neon.S')
| -rw-r--r-- | third_party/libpng16/arm/filter_neon.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libpng16/arm/filter_neon.S b/third_party/libpng16/arm/filter_neon.S index 3b061d6bbf..000764cd21 100644 --- a/third_party/libpng16/arm/filter_neon.S +++ b/third_party/libpng16/arm/filter_neon.S @@ -1,9 +1,9 @@ /* filter_neon.S - NEON optimised filter functions * - * Copyright (c) 2014 Glenn Randers-Pehrson + * Copyright (c) 2014,2017 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.16 [December 22, 2014] + * Last changed in libpng 1.6.31 [July 27, 2017] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -16,7 +16,7 @@ #define PNG_VERSION_INFO_ONLY #include "../pngpriv.h" -#if defined(__linux__) && defined(__ELF__) +#if (defined(__linux__) || defined(__FreeBSD__)) && defined(__ELF__) .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ #endif |