blob: 2f8c402bda16b72823291cdbe0e7a2d533828fa4 [file] [log] [blame]
Alex Naidis6eb7d372016-10-16 23:10:08 +02001Any Android specific modifications to upstream libjpeg-turbo (1.5.1) should
Matt Sarettb3ffc5a2015-11-24 12:18:04 -05002be 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
Alex Naidis6eb7d372016-10-16 23:10:08 +020013(2) simd/jsimdext.inc
Matt Sarettb3ffc5a2015-11-24 12:18:04 -050014
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).
DRCc8d146c2016-09-22 14:19:29 -050026
27(3) jmemmgr.c
28
29Fix broken build with NDK platforms < android-21
30Cherry picked from upstream:
Colin Cross98125af2016-12-01 16:56:18 -080031https://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
Bryan Ferris352b59d2019-07-24 12:38:05 -070037
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