Alex Naidis | 6eb7d37 | 2016-10-16 23:10:08 +0200 | [diff] [blame] | 1 | Any Android specific modifications to upstream libjpeg-turbo (1.5.1) should |
Matt Sarett | b3ffc5a | 2015-11-24 12:18:04 -0500 | [diff] [blame] | 2 | be listed here: |
| 3 | |
| 4 | (1) jconfig.h and jconfigint.h |
| 5 | |
| 6 | These are included upstream as jconfig.h.in and jconfigint.h.in. |
| 7 | We have the option autogenerate these platform/version specific files (using |
| 8 | the libjpeg-turbo build system) or to manually create them. |
| 9 | |
| 10 | Autogenerating these files on linux gets us most of the way, but we've needed |
| 11 | to add some multi-platform flexibility to the INLINE and SIZEOF_SIZE_T macros. |
| 12 | |
Alex Naidis | 6eb7d37 | 2016-10-16 23:10:08 +0200 | [diff] [blame] | 13 | (2) simd/jsimdext.inc |
Matt Sarett | b3ffc5a | 2015-11-24 12:18:04 -0500 | [diff] [blame] | 14 | |
| 15 | The modification enables us to compile x86 SIMD. |
| 16 | |
| 17 | The original code was: |
| 18 | %define EXTN(name) _ %+ name |
| 19 | The new code is: |
| 20 | %define EXTN(name) name |
| 21 | |
| 22 | It is unclear why the unmodified code from upstream appends an underscore |
| 23 | to name. Before removing the underscore, the code failed to link because |
| 24 | the function names in the SIMD code did not match the callers (because of |
| 25 | the extra underscore). |
DRC | c8d146c | 2016-09-22 14:19:29 -0500 | [diff] [blame] | 26 | |
| 27 | (3) jmemmgr.c |
| 28 | |
| 29 | Fix broken build with NDK platforms < android-21 |
| 30 | Cherry picked from upstream: |
Colin Cross | 98125af | 2016-12-01 16:56:18 -0800 | [diff] [blame] | 31 | https://github.com/libjpeg-turbo/libjpeg-turbo/commit/dfefba77520ded5c5fd4864e76352a5f3eb23e74 |
| 32 | |
| 33 | (4) rdppm.c |
| 34 | Fix sign mismatch comparison warnings |
| 35 | Cherry picked from upstream: |
| 36 | https://github.com/libjpeg-turbo/libjpeg-turbo/commit/d22fd541bf9dd87889c25909e19a640a580bcad7 |
Bryan Ferris | 352b59d | 2019-07-24 12:38:05 -0700 | [diff] [blame] | 37 | |
| 38 | (5) java/TJBench.java, tjbench.c, tjunittest.c, and turbojpeg.c |
| 39 | Add checks to ensure that the image is not larger than the allocated buffers. |
| 40 | Cherry picked from upstream: |
| 41 | https://github.com/libjpeg-turbo/libjpeg-turbo/commit/2a9e3bd7430cfda1bc812d139e0609c6aca0b884 |