Squashed 'libwebp_src/' changes from 0d1f12546..ca332209c

ca332209c update ChangeLog 1ace578c9 update NEWS 63234c429 bump version to 1.3.2 2af26267c Fix OOB write in BuildHuffmanTable. fd7bb21c0 update ChangeLog e1adea50e update NEWS 433933203 enc/*: normalize WebPEncodingSetError() calls 287fdefe9 enc/*: add missing WebPEncodingSetError() calls c3bd7cff2 EncodeAlphaInternal: add missing error check d49cfbb34 vp8l_enc,WriteImage: add missing error check 2e5a9ec3b muxread,MuxImageParse: add missing error checks ebb6f949f cmake,emscripten: explicitly set stack size 59a2b1f9e WebPDecodeYUV: check u/v/stride/uv_stride ptrs 8e965ccb0 Call png_get_channels() to see if image has alpha 7f0a34194 update ChangeLog bab7efbe7 update NEWS 7138bf8fc bump version to 1.3.1 435b4ded4 update AUTHORS 473512298 update .mailmap ff6c7f4e7 CONTRIBUTING.md: add C style / cmake-format notes dd530437f add .cmake-format.py adbe2cb17 cmake,cosmetics: apply cmake-format 15b365083 doc/webp-container-spec: rm future codec comment c369c4bf0 doc/webp-lossless-bitstream-spec: improve link text 1de35f476 doc/webp-container-spec: don't use 'currently' bb06a16ed doc/webp-container-spec: prefer present tense 9f38b71e0 doc/webp-lossless-bitstream-spec: prefer present tense 7acb6b829 doc/webp-container-spec: avoid i.e. & e.g. 4967e7cd7 doc/webp-lossless-bitstream-spec: avoid i.e. & e.g. e3366659a Merge "Do not find_package image libraries if not needed." into main 428588ef9 clarify single leaf node trees and use of canonical prefix coding 709ec152d Do not find_package image libraries if not needed. 8dd80ef81 fuzz_utils.h: lower kFuzzPxLimit w/ASan 8f187b9f7 Clean message calls in CMake cba300781 WebPConfig.cmake.in: use calculated include path 6cf9a76ae Merge "webp-lossless-bitstream-spec: remove use of 'dynamics'" into main 740943b27 Merge "Specialize and optimize ITransform_SSE2 using do_two" into main 2d547e24d Compare kFuzzPxLimit to max_num_operations ac42dde1c Specialize and optimize ITransform_SSE2 using do_two 17e0ef1da webp-lossless-bitstream-spec: remove use of 'dynamics' ed2743716 neon.h,cosmetics: clear a couple lint warnings 3fb829476 cpu.h,cosmetics: segment defines 0c496a4ff cpu.h: add WEBP_AARCH64 8151f388e move VP8GetCPUInfo declaration to cpu.c 916548c28 Make kFuzzPxLimit sanitizer dependent 4070b271a advanced_api_fuzzer: reduce scaling limit 761f49c3a Merge "webp-lossless-bitstream-spec: add missing bits to ABNF" into main 84d04c484 webp-lossless-bitstream-spec: add missing bits to ABNF 0696e1a7f advanced_api_fuzzer: reduce scaling limit 93d88aa25 Merge "deps.cmake: remove unneeded header checks" into main 118e0035d deps.cmake: remove unneeded header checks 4c3d7018c webp-lossless-bitstream-spec: condense normal-prefix-code a6a09b329 webp-lossless-bitstream-spec: fix 2 code typos 50ac4f7c9 Merge "cpu.h: enable NEON w/_M_ARM64EC" into main 4b7d7b4f2 Add contribution instructions 0afbd97b4 cpu.h: enable NEON w/_M_ARM64EC 349f4353d Merge changes Ibd89e56b,Ic57e7f84,I89096614 into main 8f7513b7c upsampling_neon.c: fix WEBP_SWAP_16BIT_CSP check cbf624b56 advanced_api_fuzzer: reduce scaling limit 89edfdd1e Skip slow scaling in libwebp advanced_api_fuzzer 859f19f74 Reduce libwebp advanced_api_fuzzer threshold a4f048357 Merge changes Ic389aaa2,I329ccd79 into main 1275fac82 Makefile.vc: fix img2webp link w/dynamic cfg 2fe27bb96 img2webp: normalize help output 24bed3d9f cwebp: reflow -near_lossless help text 0825faa4c img2webp: add -sharp_yuv/-near_lossless d64e6d7d9 Merge "PaletteSortModifiedZeng: fix leak on error" into main 0e12a22d8 Merge "EncodeAlphaInternal: clear result->bw on error" into main 0edbb6ea7 PaletteSortModifiedZeng: fix leak on error 41ffe04e1 Merge "Update yapf style from "chromium" to "yapf"" into main 2d9d9265f Update yapf style from "chromium" to "yapf" a486d800b EncodeAlphaInternal: clear result->bw on error 1347a32d8 Skip big scaled advanced_api_fuzzer 52b6f0670 Fix scaling limit in advanced_api_fuzzer.c 736184283 Limit scaling in libwebp advanced_api_fuzzer.c b54d21a01 Merge "CMakeLists.txt: allow CMAKE_INSTALL_RPATH to be set empty" into main 31c28db53 libwebp{,demux,mux}.pc.in: Requires -> Requires.private d9a505ffb CMakeLists.txt: allow CMAKE_INSTALL_RPATH to be set empty bdf33d03b Merge tag 'v1.3.0' b55777696 update ChangeLog 0ba772442 update NEWS e763eb1ea bump version to 1.3.0 2a8686fca update AUTHORS 106a57c1d Merge "*/Android.mk: add a check for NDK_ROOT" into main c5e841c41 Merge "extras: WebpToSDL -> WebPToSDL" into main dbc307151 Merge "xcframeworkbuild.sh: bump MACOSX_CATALYST_MIN_VERSION" into main 6fc1a9f96 */Android.mk: add a check for NDK_ROOT d3e151fc0 doc/api.md,webp_js/README.md: Webp -> WebP ed92a6264 extras: WebpToSDL -> WebPToSDL 6eb0189b2 xcframeworkbuild.sh: bump MACOSX_CATALYST_MIN_VERSION 1d58575b1 CMake: align .pc variables with autoconf e5fe2cfc1 webp-lossless-bitstream-spec,cosmetics: reflow paragraphs 0ceeeab98 webp-lossless-bitstream-spec: add amendment note 607611cd8 Merge "webp-container-spec: normalize section title case" into main f853685e1 lossless: SUBTRACT_GREEN -> SUBTRACT_GREEN_TRANSFORM 786497e48 webp-lossless-bitstream-spec: fix inv color txfm description c6ac672db webp-lossless-bitstream-spec: fix num_code_lengths check b5700efb7 webp-lossless-bitstream-spec,cosmetics: grammar/capitalization d8ed8c117 webp-container-spec: normalize section title case 52ec0b8f6 Merge changes Ie975dbb5,Ifc8c93af,I6ca7c5d6,I2e8d66f5,I152477b8 into main 5097ef625 webp-container-spec,cosmetics: grammar/capitalization e3ba2b1f5 webp-lossless-bitstream-spec,cosmetics: reflow abstract 1e8e3ded2 webp-lossless-bitstream-spec: reword abstract re alpha 017cb6fa9 webp-container-spec,cosmetics: normalize range syntax f6a4684ba webp-lossless-bitstream-spec,cosmetics: normalize range syntax 54ebd5a37 webp-lossless-bitstream-spec: limit dist map lut to 69 cols 44741f9c5 webp-lossless-bitstream-spec: fix dist mapping example fad0ece7e pnmdec.c: use snprintf instead of sprintf 3f73e8f7a sharpyuv: add SharpYuvGetVersion() ce2f2d668 SharpYuvConvert: fix a race on SharpYuvGetCPUInfo a458e3086 sharpyuv_dsp.h: restore sharpyuv_cpu.h include 9ba800a74 Merge changes Id72fbf3b,Ic59d23a2 into main 979c0ebbc sharpyuv: add SharpYuvGetCPUInfo 8bab09a4a Merge "*.pc.in: rename lib_prefix to webp_libname_prefix" into main 769387c54 cpu.c,cosmetics: fix a typo a02978c25 sharpyuv/Makefile.am+cmake: add missing -lm 28aedcb9b *.pc.in: rename lib_prefix to webp_libname_prefix c42e6d5a8 configure.ac: export an empty lib_prefix variable dfc843aa6 Merge "*.pc.in: add lib prefix to lib names w/MSVC" into main 2498209ba *.pc.in: add lib prefix to lib names w/MSVC ac252b611 Merge "analysis_enc.c: fix a dead store warning" into main 569447624 analysis_enc.c: fix a dead store warning d34f9b99b Merge "webp-lossless-bitstream-spec: convert BNF to ABNF" into main dc05b4db2 Merge changes I96bc063c,I45880467,If9e18e5a,I6ee938e4,I0a410b28, ... into main 83270c7f8 webp-container-spec: add prose for rendering process 73b19b64f webp-container-spec: note reserved fields MUST be ignored 57101d3fc webp-lossless-bitstream-spec: improve 'small' color table stmt dfd32e459 webp-container-spec: remove redundant sentence 8a6185dd2 doc/webp-*: fix some punctuation, grammar 72776530d webp-lossless-bitstream-spec: convert BNF to ABNF d992bb08b cmake: rename cpufeatures target to cpufeatures-webp 3ed2b2751 webp-container-spec: clarify background color note 951c292d1 webp-container-spec: come too late -> out of order 902dd7876 webp-container-spec: prefer hex literals a8f6b5ee9 webp-container-spec: change SHOULD to MUST w/ANIM chunk 1dc594352 webp-container-spec: add unknown fields MUST be ignored 280a810f2 webp-container-spec: make padding byte=0 a MUST 41f0bf680 webp-container-spec: update note on trailing data 6bdd36dbe webp-container-spec: clarify Chunk Size is in bytes 87e36c485 Merge "webp_js/README.md,cosmetics: reflow some lines" into main 5b01f3216 Merge "Update Windows makefile to build libsharpyuv library." into main 19b1a71c4 webp_js/README.md,cosmetics: reflow some lines 780db7561 Update Windows makefile to build libsharpyuv library. e407d4b37 CMakeLists.txt: replace GLUT_glut_LIBRARY w/GLUT::GLUT abf73d628 Merge "WebPConfig.cmake.in: add find_dependency(Threads)" into main 25807fb4c Merge "cmake: restore compatibility with cmake < 3.12" into main 5dbc4bfa1 WebPConfig.cmake.in: add find_dependency(Threads) b2a175dd0 Merge "Update wasm instructions." into main cb90f76b6 Update wasm instructions. 02d152586 cmake: restore compatibility with cmake < 3.12 5ba046e25 CMake: add_definitions -> add_compile_options e68765af4 dsp,neon: use vaddv in a few more places e8f83de28 Set libsharpyuv include dir to 'webp' subdirectory. 15a91ab17 cmake,cosmetics: apply cmake-format 0dd49d1a3 CMakeLists.txt: set @only in configure_file() calls 62b1bfe8b Merge changes I2877e7bb,I777cad70,I15af7d1a,I686e6740,If10538a9, ... into main 95c8fe5f3 Merge changes Iecea3603,I9dc228ab into main e7c805cfa picture_csp_enc.c: remove SafeInitSharpYuv 6af8845a8 sharpyuv: prefer webp/types.h 639619ce7 cmake: fix dll exports 782ed48cd sharpyuv,SharpYuvInit: add mutex protection when available cad0d5adb sharyuv_{neon,sse2}.c: merge WEBP_USE_* sections ef70ee06f add a few missing <stddef.h> includes for NULL f0f9eda40 sharpyuv.h: remove <inttypes.h> 9b902cbac Merge "picture_csp_enc.c,CheckNonOpaque: rm unneeded local" into main 9c1d457c0 cmake/cpu.cmake: remove unused variable 9ac25bcb3 CMakeLists.txt,win32: match naming convention used by nmake 76c353bab picture_csp_enc.c,CheckNonOpaque: rm unneeded local 5000de543 Merge "cwebp: fix WebPPictureHasTransparency call" into main e17293095 Merge "WebPPictureHasTransparency: add missing pointer check" into main 00ff988a5 vp8l_enc,AddSingleSubGreen: clear int sanitizer warnings e2fecc22e dsp/lossless_enc.c: clear int sanitizer warnings 129cf9e97 dsp/lossless.c: clear int sanitizer warnings ad7d1753c dsp/lossless_enc.c: clear int sanitizer warnings 5037220e5 VP8LSubtractGreenFromBlueAndRed_C: clear int sanitizer warnings 2ee786c74 upsampling_sse2.c: clear int sanitizer warnings 4cc157d48 ParseOptionalChunks: clear int sanitizer warning 892cf033b BuildHuffmanTable: clear int sanitizer warning 3a9a4d458 VP8GetSigned: clear int sanitizer warnings 704a3d0a1 dsp/lossless.c: quiet int sanitizer warnings 1a6c109c9 WebPPictureHasTransparency: add missing pointer check c626e7d54 cwebp: fix WebPPictureHasTransparency call 866e349ce Merge tag 'v1.2.4' c170df383 Merge "Create libsharpyuv.a in makefile.unix." into main 9d7ff74a5 Create libsharpyuv.a in makefile.unix. fcbc2d78a Merge "doc/*.txt: restrict code to 69 columns" into main 4ad0e1895 Merge "webp-container-spec.txt: normalize fourcc spelling" into main 7a0a9935e doc/*.txt: restrict code to 69 columns c040a615b webp-container-spec.txt: normalize fourcc spelling aff1c546e dsp,x86: normalize types w/_mm_cvtsi128_si32 calls ab540ae0c dsp,x86: normalize types w/_mm_cvtsi32_si128 calls 8980362ee dsp,x86: normalize types w/_mm_set* calls (2) 835392393 dsp,x86: normalize types w/_mm_set* calls 8a4576ce2 webp-container-spec.txt: replace & with & db8708816 Merge "webp-container-spec.txt: make reserved 0 values a MUST" into main 01d7d378d webp-lossless-bitstream-spec: number all sections 337cf69f5 webp-lossless-bitstream-spec: mv Nomenclature after Intro 79be856e6 Merge changes I7111d1f7,I872cd62c into main 5b87983ad webp-container-spec.txt: make reserved 0 values a MUST bd9391232 Merge changes I7a25b1a6,I51b2c2a0,I87d0cbcf,I6ec60af6,I0a3fe9dc into main 04764b56a libwebp.pc: add libsharpyuv to requires 7deee8103 libsharpyuv: add pkg-config file 1a64a7e64 webp-container-spec.txt: clarify some SHOULDs bec2c88a1 webp-container-spec.txt: move ChunkHeader to terminology c9359332a webp-container-spec.txt: clarify 'VP8 '/'XMP ' fourccs 70fe3063a webp-container-spec.txt: rightsize table entries ddbf3f3f2 webp-container-spec.txt: update 'key words' text c151e95bd utils.h,WEBP_ALIGN: make bitmask unsigned 748e92bbb add WebPInt32ToMem 3fe15b677 Merge "Build libsharpyuv as a full installable library." into main 4f402f34a add WebPMemToInt32 a3b68c195 Build libsharpyuv as a full installable library. b4994eaa6 CMake: set rpath for shared objects 94cd71177 Merge "CMake: fix dylib versioning" into main e91451b69 Fix the lossless specs a bit more. 231bdfb76 CMake: fix dylib versioning 7366f7f39 Merge "lossless: fix crunch mode w/WEBP_REDUCE_SIZE" into main 84163d9d0 lossless: fix crunch mode w/WEBP_REDUCE_SIZE d01c1eb30 webp-lossless-bitstream-spec,cosmetics: normalize capitalization 8813ca8e6 Merge tag 'v1.2.3' git-subtree-dir: libwebp_src git-subtree-split: ca332209cb5567c9b249c86788cb2dbf8847e760
bep · Nov 27, 2023 · ca2fa43 · ca2fa43
1 parent 1feb407
commit ca2fa43
Show file tree

Hide file tree

Showing 128 changed files with 2,615 additions and 1,474 deletions.
diff --git a/.cmake-format.py b/.cmake-format.py
@@ -0,0 +1,240 @@
+# ----------------------------------
+# Options affecting listfile parsing
+# ----------------------------------
+with section("parse"):
+
+  # Specify structure for custom cmake functions
+  additional_commands = { 'foo': { 'flags': ['BAR', 'BAZ'],
+             'kwargs': {'DEPENDS': '*', 'HEADERS': '*', 'SOURCES': '*'}}}
+
+  # Override configurations per-command where available
+  override_spec = {}
+
+  # Specify variable tags.
+  vartags = []
+
+  # Specify property tags.
+  proptags = []
+
+# -----------------------------
+# Options affecting formatting.
+# -----------------------------
+with section("format"):
+
+  # Disable formatting entirely, making cmake-format a no-op
+  disable = False
+
+  # How wide to allow formatted cmake files
+  line_width = 80
+
+  # How many spaces to tab for indent
+  tab_size = 2
+
+  # If true, lines are indented using tab characters (utf-8 0x09) instead of
+  # <tab_size> space characters (utf-8 0x20). In cases where the layout would
+  # require a fractional tab character, the behavior of the  fractional
+  # indentation is governed by <fractional_tab_policy>
+  use_tabchars = False
+
+  # If <use_tabchars> is True, then the value of this variable indicates how
+  # fractional indentions are handled during whitespace replacement. If set to
+  # 'use-space', fractional indentation is left as spaces (utf-8 0x20). If set
+  # to `round-up` fractional indentation is replaced with a single tab character
+  # (utf-8 0x09) effectively shifting the column to the next tabstop
+  fractional_tab_policy = 'use-space'
+
+  # If an argument group contains more than this many sub-groups (parg or kwarg
+  # groups) then force it to a vertical layout.
+  max_subgroups_hwrap = 3
+
+  # If a positional argument group contains more than this many arguments, then
+  # force it to a vertical layout.
+  max_pargs_hwrap = 6
+
+  # If a cmdline positional group consumes more than this many lines without
+  # nesting, then invalidate the layout (and nest)
+  max_rows_cmdline = 2
+
+  # If true, separate flow control names from their parentheses with a space
+  separate_ctrl_name_with_space = False
+
+  # If true, separate function names from parentheses with a space
+  separate_fn_name_with_space = False
+
+  # If a statement is wrapped to more than one line, than dangle the closing
+  # parenthesis on its own line.
+  dangle_parens = False
+
+  # If the trailing parenthesis must be 'dangled' on its on line, then align it
+  # to this reference: `prefix`: the start of the statement,  `prefix-indent`:
+  # the start of the statement, plus one indentation  level, `child`: align to
+  # the column of the arguments
+  dangle_align = 'prefix'
+
+  # If the statement spelling length (including space and parenthesis) is
+  # smaller than this amount, then force reject nested layouts.
+  min_prefix_chars = 4
+
+  # If the statement spelling length (including space and parenthesis) is larger
+  # than the tab width by more than this amount, then force reject un-nested
+  # layouts.
+  max_prefix_chars = 10
+
+  # If a candidate layout is wrapped horizontally but it exceeds this many
+  # lines, then reject the layout.
+  max_lines_hwrap = 2
+
+  # What style line endings to use in the output.
+  line_ending = 'unix'
+
+  # Format command names consistently as 'lower' or 'upper' case
+  command_case = 'canonical'
+
+  # Format keywords consistently as 'lower' or 'upper' case
+  keyword_case = 'unchanged'
+
+  # A list of command names which should always be wrapped
+  always_wrap = []
+
+  # If true, the argument lists which are known to be sortable will be sorted
+  # lexicographicall
+  enable_sort = True
+
+  # If true, the parsers may infer whether or not an argument list is sortable
+  # (without annotation).
+  autosort = False
+
+  # By default, if cmake-format cannot successfully fit everything into the
+  # desired linewidth it will apply the last, most agressive attempt that it
+  # made. If this flag is True, however, cmake-format will print error, exit
+  # with non-zero status code, and write-out nothing
+  require_valid_layout = False
+
+  # A dictionary mapping layout nodes to a list of wrap decisions. See the
+  # documentation for more information.
+  layout_passes = {}
+
+# ------------------------------------------------
+# Options affecting comment reflow and formatting.
+# ------------------------------------------------
+with section("markup"):
+
+  # What character to use for bulleted lists
+  bullet_char = '*'
+
+  # What character to use as punctuation after numerals in an enumerated list
+  enum_char = '.'
+
+  # If comment markup is enabled, don't reflow the first comment block in each
+  # listfile. Use this to preserve formatting of your copyright/license
+  # statements.
+  first_comment_is_literal = True
+
+  # If comment markup is enabled, don't reflow any comment block which matches
+  # this (regex) pattern. Default is `None` (disabled).
+  literal_comment_pattern = None
+
+  # Regular expression to match preformat fences in comments default=
+  # ``r'^\s*([`~]{3}[`~]*)(.*)$'``
+  fence_pattern = '^\\s*([`~]{3}[`~]*)(.*)$'
+
+  # Regular expression to match rulers in comments default=
+  # ``r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'``
+  ruler_pattern = '^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'
+
+  # If a comment line matches starts with this pattern then it is explicitly a
+  # trailing comment for the preceeding argument. Default is '#<'
+  explicit_trailing_pattern = '#<'
+
+  # If a comment line starts with at least this many consecutive hash
+  # characters, then don't lstrip() them off. This allows for lazy hash rulers
+  # where the first hash char is not separated by space
+  hashruler_min_length = 10
+
+  # If true, then insert a space between the first hash char and remaining hash
+  # chars in a hash ruler, and normalize its length to fill the column
+  canonicalize_hashrulers = True
+
+  # enable comment markup parsing and reflow
+  enable_markup = True
+
+# ----------------------------
+# Options affecting the linter
+# ----------------------------
+with section("lint"):
+
+  # a list of lint codes to disable
+  disabled_codes = []
+
+  # regular expression pattern describing valid function names
+  function_pattern = '[0-9a-z_]+'
+
+  # regular expression pattern describing valid macro names
+  macro_pattern = '[0-9A-Z_]+'
+
+  # regular expression pattern describing valid names for variables with global
+  # (cache) scope
+  global_var_pattern = '[A-Z][0-9A-Z_]+'
+
+  # regular expression pattern describing valid names for variables with global
+  # scope (but internal semantic)
+  internal_var_pattern = '_[A-Z][0-9A-Z_]+'
+
+  # regular expression pattern describing valid names for variables with local
+  # scope
+  local_var_pattern = '[a-z][a-z0-9_]+'
+
+  # regular expression pattern describing valid names for privatedirectory
+  # variables
+  private_var_pattern = '_[0-9a-z_]+'
+
+  # regular expression pattern describing valid names for public directory
+  # variables
+  public_var_pattern = '[A-Z][0-9A-Z_]+'
+
+  # regular expression pattern describing valid names for function/macro
+  # arguments and loop variables.
+  argument_var_pattern = '[a-z][a-z0-9_]+'
+
+  # regular expression pattern describing valid names for keywords used in
+  # functions or macros
+  keyword_pattern = '[A-Z][0-9A-Z_]+'
+
+  # In the heuristic for C0201, how many conditionals to match within a loop in
+  # before considering the loop a parser.
+  max_conditionals_custom_parser = 2
+
+  # Require at least this many newlines between statements
+  min_statement_spacing = 1
+
+  # Require no more than this many newlines between statements
+  max_statement_spacing = 2
+  max_returns = 6
+  max_branches = 12
+  max_arguments = 5
+  max_localvars = 15
+  max_statements = 50
+
+# -------------------------------
+# Options affecting file encoding
+# -------------------------------
+with section("encode"):
+
+  # If true, emit the unicode byte-order mark (BOM) at the start of the file
+  emit_byteorder_mark = False
+
+  # Specify the encoding of the input file. Defaults to utf-8
+  input_encoding = 'utf-8'
+
+  # Specify the encoding of the output file. Defaults to utf-8. Note that cmake
+  # only claims to support utf-8 so be careful when using anything else
+  output_encoding = 'utf-8'
+
+# -------------------------------------
+# Miscellaneous configurations options.
+# -------------------------------------
+with section("misc"):
+
+  # A dictionary containing any per-command configuration overrides. Currently
+  # only `command_case` is supported.
+  per_command = {}
diff --git a/.mailmap b/.mailmap
@@ -16,3 +16,4 @@ James Zern <[email protected]>
 Roberto Alanis <[email protected]>
 Brian Ledger <[email protected]>
 Maryla Ustarroz-Calonge <[email protected]>
+Yannis Guyon <[email protected]>
diff --git a/.style.yapf b/.style.yapf
@@ -1,2 +1,2 @@
 [style]
-based_on_style = chromium
+based_on_style = yapf
diff --git a/AUTHORS b/AUTHORS
@@ -11,11 +11,13 @@ Contributors:
 - Djordje Pesut (djordje dot pesut at imgtec dot com)
 - Frank Barchard (fbarchard at google dot com)
 - Hui Su (huisu at google dot com)
+- H. Vetinari (h dot vetinari at gmx dot com)
 - Ilya Kurdyukov (jpegqs at gmail dot com)
 - Ingvar Stepanyan (rreverser at google dot com)
 - James Zern (jzern at google dot com)
 - Jan Engelhardt (jengelh at medozas dot de)
 - Jehan (jehan at girinstud dot io)
+- Jeremy Maitin-Shepard (jbms at google dot com)
 - Johann Koenig (johann dot koenig at duck dot com)
 - Jovan Zelincevic (jovan dot zelincevic at imgtec dot com)
 - Jyrki Alakuijala (jyrki at google dot com)
@@ -30,6 +32,7 @@ Contributors:
 - Mislav Bradac (mislavm at google dot com)
 - Nico Weber (thakis at chromium dot org)
 - Noel Chromium (noel at chromium dot org)
+- Nozomi Isozaki (nontan at pixiv dot co dot jp)
 - Oliver Wolff (oliver dot wolff at qt dot io)
 - Owen Rodley (orodley at google dot com)
 - Parag Salasakar (img dot mips1 at gmail dot com)
@@ -45,6 +48,7 @@ Contributors:
 - Somnath Banerjee (somnath dot banerjee at gmail dot com)
 - Sriraman Tallam (tmsriram at google dot com)
 - Tamar Levy (tamar dot levy at intel dot com)
+- Thiago Perrotta (tperrotta at google dot com)
 - Timothy Gu (timothygu99 at gmail dot com)
 - Urvang Joshi (urvang at google dot com)
 - Vikas Arora (vikasa at google dot com)

diff --git a/Android.mk b/Android.mk
@@ -1,3 +1,5 @@
+# Ignore this file during non-NDK builds.
+ifdef NDK_ROOT
 LOCAL_PATH := $(call my-dir)
 
 WEBP_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD -DWEBP_USE_THREAD
@@ -35,6 +37,7 @@ endif
 
 sharpyuv_srcs := \
     sharpyuv/sharpyuv.c \
+    sharpyuv/sharpyuv_cpu.c \
     sharpyuv/sharpyuv_csp.c \
     sharpyuv/sharpyuv_dsp.c \
     sharpyuv/sharpyuv_gamma.c \
@@ -218,7 +221,7 @@ LOCAL_SRC_FILES := \
     $(utils_enc_srcs) \
 
 LOCAL_CFLAGS := $(WEBP_CFLAGS)
-LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/src
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/src $(LOCAL_PATH)
 
 # prefer arm over thumb mode for performance gains
 LOCAL_ARM_MODE := arm
@@ -288,3 +291,4 @@ include $(WEBP_SRC_PATH)/examples/Android.mk
 ifeq ($(USE_CPUFEATURES),yes)
   $(call import-module,android/cpufeatures)
 endif
+endif  # NDK_ROOT