1Any Android specific modifications to upstream libjpeg-turbo (1.5.1) should 2be listed here: 3 4(1) jconfig.h and jconfigint.h 5 6These are included upstream as jconfig.h.in and jconfigint.h.in. 7We have the option autogenerate these platform/version specific files (using 8the libjpeg-turbo build system) or to manually create them. 9 10Autogenerating these files on linux gets us most of the way, but we've needed 11to add some multi-platform flexibility to the INLINE and SIZEOF_SIZE_T macros. 12 13(2) simd/jsimdext.inc 14 15The modification enables us to compile x86 SIMD. 16 17The original code was: 18%define EXTN(name) _ %+ name 19The new code is: 20%define EXTN(name) name 21 22It is unclear why the unmodified code from upstream appends an underscore 23to name. Before removing the underscore, the code failed to link because 24the function names in the SIMD code did not match the callers (because of 25the extra underscore). 26 27(3) jmemmgr.c 28 29Fix broken build with NDK platforms < android-21 30Cherry picked from upstream: 31https://github.com/libjpeg-turbo/libjpeg-turbo/commit/dfefba77520ded5c5fd4864e76352a5f3eb23e74 32 33(4) rdppm.c 34Fix sign mismatch comparison warnings 35Cherry picked from upstream: 36https://github.com/libjpeg-turbo/libjpeg-turbo/commit/d22fd541bf9dd87889c25909e19a640a580bcad7 37 38(5) java/TJBench.java, tjbench.c, tjunittest.c, and turbojpeg.c 39Add checks to ensure that the image is not larger than the allocated buffers. 40Cherry picked from upstream: 41https://github.com/libjpeg-turbo/libjpeg-turbo/commit/2a9e3bd7430cfda1bc812d139e0609c6aca0b884 42 43(6) java/TJBench.java, tjbench.c 44Fix logical errors when decompressing ICC data 45This was pulled in due to a SEGFAULT that occurs when running the 46proof-of-concept for (5) 47Cherry picked from upstream: 48https://github.com/libjpeg-turbo/libjpeg-turbo/commit/11eec4a398f3fc1b9d39c1d3b81b53ae85d9b5e6 49 50(7) tjbench.c 51Fix memory management access violation 52This was pulled in due to a SEGFAULT that occurs when running the 53proof-of-concept for (5) 54Cherry picked from upstream: 55https://github.com/libjpeg-turbo/libjpeg-turbo/commit/5fce2e942136cb70e5a30ff15a2d58b07947aa84 56