| OLD | NEW |
|---|
| 1 Name: libjpeg-turbo | 1 Name: libjpeg-turbo |
| 2 URL: http://sourceforge.net/projects/libjpeg-turbo/ | 2 URL: http://sourceforge.net/projects/libjpeg-turbo/ |
| 3 Version: 1.3.1 | 3 Version: 1.3.1 |
| 4 License: Custom license | 4 License: Custom license |
| 5 License File: LICENSE.txt | 5 License File: LICENSE.txt |
| 6 Security Critical: yes | 6 Security Critical: yes |
| 7 License Android Compatible: yes |
| 7 | 8 |
| 8 Description: | 9 Description: |
| 9 This consists of the components: | 10 This consists of the components: |
| 10 * A partial copy of libjpeg-turbo 1.3.1 (r1219); | 11 * A partial copy of libjpeg-turbo 1.3.1 (r1219); |
| 11 * Revision r1188 cherry-picked from upstream trunk into config.h; | 12 * Revision r1188 cherry-picked from upstream trunk into config.h; |
| 12 * Revision r1220 cherry-picked from upstream trunk into jchuff.c; | 13 * Revision r1220 cherry-picked from upstream trunk into jchuff.c; |
| 13 * Revisions r1108, r1109, r1333, r1375, r1386, r1389 and r1390 cherry-picked | 14 * Revisions r1108, r1109, r1333, r1375, r1386, r1389 and r1390 cherry-picked |
| 14 from upstream trunk for Arm64; | 15 from upstream trunk for Arm64; |
| 15 * A build file (libjpeg.gyp), and; | 16 * A build file (libjpeg.gyp), and; |
| 16 * Patched header files used by Chromium. | 17 * Patched header files used by Chromium. |
| 17 | 18 |
| 18 This libjpeg-turbo can replace our libjpeg-6b without any modifications in the | 19 This libjpeg-turbo can replace our libjpeg-6b without any modifications in the |
| 19 Chromium code. | 20 Chromium code. |
| 20 | 21 |
| 21 Same as our copy of libjpeg-6b, this libjpeg-turbo also added a new file | 22 Same as our copy of libjpeg-6b, this libjpeg-turbo also added a new file |
| 22 jpeglibmangler.h and included it from jpeglib.h that changes the names of all | 23 jpeglibmangler.h and included it from jpeglib.h that changes the names of all |
| 23 externally visible functions to chromium_* so that we can avoid conflicts that | 24 externally visible functions to chromium_* so that we can avoid conflicts that |
| 24 arise when system libraries attempt to use our libjpeg. Also, we applied the | 25 arise when system libraries attempt to use our libjpeg. Also, we applied the |
| 25 following changes which are not merged to upstream: | 26 following changes which are not merged to upstream: |
| 26 | 27 |
| 27 * Added the 'private_extern' flags on Mac (or the 'hidden' flags on Linux) to | 28 * Added the 'private_extern' flags on Mac (or the 'hidden' flags on Linux) to |
| 28 all the global symbols in '.asm' files to prevent making them external ones. | 29 all the global symbols in '.asm' files to prevent making them external ones. |
| 29 * Supported motion-JPEG frames that do not have DHT markers. | 30 * Supported motion-JPEG frames that do not have DHT markers. |
| 30 * Removed .func / .endfunc lines from arm assembly | 31 * Removed .func / .endfunc lines from arm assembly |
| 31 ( https://sourceforge.net/p/libjpeg-turbo/bugs/72/ , landed at | 32 ( https://sourceforge.net/p/libjpeg-turbo/bugs/72/ , landed at |
| 32 https://sourceforge.net/p/libjpeg-turbo/code/1375 ). | 33 https://sourceforge.net/p/libjpeg-turbo/code/1375 ). |
| 33 | 34 |
| 34 The 'google.patch' file represents our changes from the original | 35 The 'google.patch' file represents our changes from the original |
| 35 libjpeg-turbo-1.2. | 36 libjpeg-turbo-1.2. |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 539063002:
Mark libjpeg-turbo's license as OK for android. (Closed)
Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master