Commit Graph

113 Commits

Author SHA1 Message Date
7a651191a0 xorg 编译依赖 2024-12-25 00:13:55 +08:00
Werner Lemberg
1c9f9010a6 Fix heap buffer overflow (#59308).
This is CVE-2020-15999.

* src/sfnt/pngshim.c (Load_SBit_Png): Test bitmap size earlier.

Change-Id: I191c2b8a93aa84751b602f4dfc82eb10f373292b
2020-11-06 13:14:04 -07:00
Jungshik Shin
ed337850ed Update FreeType from 2.6.2 to c38be52bf8 (2.7 + a few post-2.7 CLs)
am: 055aee28ce

Change-Id: Iba759d7680fac859bbbee4e687d0e6a179a7db62
2016-09-21 06:39:18 +00:00
Jungshik Shin
055aee28ce Update FreeType from 2.6.2 to c38be52bf8 (2.7 + a few post-2.7 CLs)
http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=c38be52b

Keep all the configuration options as before.

Likewise, exclude unused files (Jamfiles, various mk files, builds/,
docs/, ChangeLog*, directories under src/ for disabled modules, etc).

Update README.android to record the configurations.

Besides, disable a new option (TT_CONFIG_OPTION_SUBPIXEL_HINTING) for
branches. Note that a bulk of changes in this CL come from the code to
implement this option.

BUG: 31470908
Change-Id: I1ca90aec171d9580415b8531e2b767e9dd31164c
2016-09-19 21:09:28 +00:00
Jungshik Shin
be9ff2aca0 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043 am: 707d74caa5 am: 8e942bf7e5 -s ours am: 56586be400 am: 37595e7d77 am: 81954b2f2f am: 2fc1f401ea -s ours
am: 3dfa720cf1

* commit '3dfa720cf15e6b771f70901e7ce44a15d6df05a4':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: If04b1b561bb5fd4ac30c9f317ab4b535a03b45a9
2016-05-10 10:25:38 +00:00
Jungshik Shin
3dfa720cf1 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043 am: 707d74caa5 am: 8e942bf7e5 -s ours am: 56586be400 am: 37595e7d77 am: 81954b2f2f
am: 2fc1f401ea  -s ours

* commit '2fc1f401eab7d7d5e130b3662e7c67deb0cc1abb':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: I022e745dbc9ccc144b05f877629341b019fadbcf
2016-05-10 10:18:57 +00:00
Jungshik Shin
2fc1f401ea [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043 am: 707d74caa5 am: 8e942bf7e5 -s ours am: 56586be400 am: 37595e7d77
am: 81954b2f2f

* commit '81954b2f2f1a7cf74339615ff5a2a3069008eaaa':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: Ic9089e4e839638c91372816c5d5bb1e7bbaa0bae
2016-05-10 10:12:10 +00:00
Jungshik Shin
81954b2f2f [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043 am: 707d74caa5 am: 8e942bf7e5 -s ours am: 56586be400
am: 37595e7d77

* commit '37595e7d77511d1ec36a9161c236f681cac437a4':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: I48af4b74175b9b365fda1bf5d36714665cd2504f
2016-05-10 10:05:21 +00:00
Jungshik Shin
37595e7d77 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043 am: 707d74caa5 am: 8e942bf7e5 -s ours
am: 56586be400

* commit '56586be4003580fd7f7a493772cf075d641464e9':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: Ic2cd2a60dee79a89327c6aea3f0efc5c656898c7
2016-05-10 09:58:35 +00:00
Jungshik Shin
56586be400 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043 am: 707d74caa5
am: 8e942bf7e5  -s ours

* commit '8e942bf7e56240830f2282c4a499f4e14d8648ba':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: I310a61d84e870d750380fb5e53bc49c91b57998c
2016-05-10 09:51:57 +00:00
Jungshik Shin
8e942bf7e5 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours am: e85ef9a043
am: 707d74caa5

* commit '707d74caa5c30762a89b6a9ab1cf82210482c806':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: I0d66eedbe171de6d50993718afda3050346fb33c
2016-05-10 09:45:16 +00:00
Jungshik Shin
707d74caa5 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours am: 6aebab2093 -s ours
am: e85ef9a043

* commit 'e85ef9a0436adb36d34cdae7a0e0e05e9bd057ca':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: I26d2e96957dc4c0a8e13de0d4aedef1ba80169e1
2016-05-10 09:38:07 +00:00
Jungshik Shin
e85ef9a043 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26 -s ours
am: 6aebab2093  -s ours

* commit '6aebab209355ba1eb337edadb2aa9c6a22cdc5ba':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: I89024d5f1a561f055b298c834acd0592122ee7f1
2016-05-10 09:31:31 +00:00
Jungshik Shin
6aebab2093 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb
am: 52b3a17d26  -s ours

* commit '52b3a17d26360ec50c83c28a505dcffedf9ec5a6':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: Ib9997408f6f9799335f148d2311db08ced411794
2016-05-10 09:25:00 +00:00
Jungshik Shin
52b3a17d26 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914
am: d55dd850cb

* commit 'd55dd850cb607cc8062edf5f612959c1c2b24212':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: Id060a74323f306e70d5bcfc94efa21e277ed16a7
2016-05-10 09:18:41 +00:00
Jungshik Shin
d55dd850cb [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12
am: 42a6868914

* commit '42a68689140022fd8c067ff75fc5d573fe8f02d0':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: Id7957d2368e2e14df391316eeb447f8f30e882a3
2016-05-10 09:12:15 +00:00
Jungshik Shin
a39ea5f7d9 Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev am: 219e246447 am: cf4d9f4ed4 am: 67b57610bd am: 08cec17454 -s ours
am: 4ef1089965

* commit '4ef1089965fbed7256cbf2d6d91c93276cbe25e9':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0

Change-Id: I5adebed2ae7ea449ea68f42cc45cd84204796795
2016-05-10 00:31:35 +00:00
Jungshik Shin
4ef1089965 Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev am: 219e246447 am: cf4d9f4ed4 am: 67b57610bd
am: 08cec17454  -s ours

* commit '08cec174540632cdd99457eb53ac2d854efe5c87':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0

Change-Id: I2056c46d402b57deac8c5c9da7fac73cac5f0538
2016-05-10 00:25:49 +00:00
Jungshik Shin
08cec17454 Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev am: 219e246447 am: cf4d9f4ed4
am: 67b57610bd

* commit '67b57610bd5cb9508383d7ba83587eebe26303da':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0

Change-Id: Ic5454f67430f2c8ec066efb57f5b6e2eb94b7c06
2016-05-10 00:20:11 +00:00
Jungshik Shin
54bfe3fcd8 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours am: 7d195cc027 am: e357c551c6 am: 071298add4 -s ours am: 0cfbc24ba6 am: 162a60bdb9 am: df1aa4e401 am: 963f3505a4 -s ours
am: dd8ffe5348

* commit 'dd8ffe5348cef32ba37b33d199d4272adf5f918e':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: Ibe6e6263d63e6b17e934d2773965122966bed083
2016-05-10 00:15:01 +00:00
Jungshik Shin
67b57610bd Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev am: 219e246447
am: cf4d9f4ed4

* commit 'cf4d9f4ed4773ad0bd00904bac26e81e8ad88163':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0

Change-Id: I0b3a7491b934a88dd9fbdb08e8e13c95012b6de8
2016-05-10 00:14:35 +00:00
Jungshik Shin
dd8ffe5348 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours am: 7d195cc027 am: e357c551c6 am: 071298add4 -s ours am: 0cfbc24ba6 am: 162a60bdb9 am: df1aa4e401
am: 963f3505a4  -s ours

* commit '963f3505a4fa936be5e9b1af7231c31cd7afe9a6':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: I746f0ed58e1eab032d365712b78b009f07961627
2016-05-10 00:09:02 +00:00
Jungshik Shin
963f3505a4 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours am: 7d195cc027 am: e357c551c6 am: 071298add4 -s ours am: 0cfbc24ba6 am: 162a60bdb9
am: df1aa4e401

* commit 'df1aa4e401730cc55492204e73b1287837331cf2':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: I2eee1252803c2faea757cdcf104bb7f25d2f0dd3
2016-05-10 00:03:26 +00:00
Jungshik Shin
cf4d9f4ed4 Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev
am: 219e246447

* commit '219e246447ceb1437dcd052ca38e36a48d46f2df':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0

Change-Id: I00eed3bbb6aaa0daefb4b5fd5449c482ebebdd84
2016-05-10 00:03:25 +00:00
Jungshik Shin
df1aa4e401 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours am: 7d195cc027 am: e357c551c6 am: 071298add4 -s ours am: 0cfbc24ba6
am: 162a60bdb9

* commit '162a60bdb9ca182db69dd79132071ed7c85a75fc':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: I3f3a73d42e224c9133926e0ed3ff652f60b4f10c
2016-05-09 23:57:24 +00:00
Jungshik Shin
219e246447 Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev 2016-05-09 23:52:38 +00:00
Jungshik Shin
162a60bdb9 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours am: 7d195cc027 am: e357c551c6 am: 071298add4 -s ours
am: 0cfbc24ba6

* commit '0cfbc24ba69a482c882d2d7a4a43b25b9133fd1a':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: Ia8a55f989768d7ebbe070e83e9f95d72e835d848
2016-05-09 23:51:45 +00:00
Jungshik Shin
0cfbc24ba6 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours am: 7d195cc027 am: e357c551c6
am: 071298add4  -s ours

* commit '071298add4f54763c777e52eca35bcad0df4c734':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: I1b1fa2ca8900263ffa273327d7522fd16371cfc8
2016-05-09 23:45:44 +00:00
Jungshik Shin
071298add4 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours am: 7d195cc027
am: e357c551c6

* commit 'e357c551c6e64b834ddd7181798164ba563ad481':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: I0e02cfa4be34081b5867d5b503b0d1dce5b3106c
2016-05-09 23:40:11 +00:00
Jungshik Shin
e357c551c6 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c -s ours
am: 7d195cc027

* commit '7d195cc027c17bc036de44b1b8bc49bf4cb04ffc':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: I79c73eefc570e5d79d34b43f0bfe45da9e02b079
2016-05-09 23:34:19 +00:00
Jungshik Shin
7d195cc027 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3
am: 36b415ed6c  -s ours

* commit '36b415ed6caaf7e7c292507f9d8d03a3b451db22':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: I1c800c032a5985ec9e32315b5097db057ff113d0
2016-05-09 23:28:53 +00:00
Jungshik Shin
00e93e2e62 [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0
am: 99748bb350  -s ours

* commit '99748bb350b2a34821953d97ca4ca185ad2e6c08':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0
2016-02-22 22:52:09 +00:00
Jungshik Shin
99748bb350 [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0
1. Update to a512b0fe7a (several patches past 2.6.2). 
   Major changes include
   - stem-darkening is OFF for CFF fonts by default
   - general code tightening
   - header file location is back to include/freetype (used be include/)
2. A bit more details are added to README.android for the reference.

This CL requires a pdfium change (the way it includes FT header
files : https://googleplex-android-review.git.corp.google.com/#/c/846889

An AOSP master CL 
(https://android-review.googlesource.com/#/c/196504/) is ported
to mnc-dev.

Bug: 24296662

Change-Id: Iec6784838d89098f332e6d1ed79663efd91a8441
Signed-off-by: Jungshik Shin <jungshik@google.com>
2016-02-13 00:05:02 +00:00
Jungshik Shin
42a6868914 [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12
1. Update to a512b0fe7a (several patches past 2.6.2).
   Major changes include
   - stem-darkening is OFF for CFF fonts by default (not relevant to klp)
   - general code tightening

2. A bit more details are added to README.android for the reference.

The size change (libft2.so) :  49,156 bytes (from 328,944 to 378,100)

master CL (https://android-review.googlesource.com/#/c/196504/) is ported

BUG=24296662

Change-Id: I159f2df689808d77d79f0e4b9ccd6be6e97db08d
Signed-off-by: Jungshik Shin <jungshik@google.com>
2016-01-20 17:31:50 +00:00
Jungshik Shin
03b9d92cd9 [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0
1. Update to a512b0fe7a (several patches past 2.6.2). 
   Major changes include
   - stem-darkening is OFF for CFF fonts by default
   - general code tightening
   - header file location is back to include/freetype (used be include/)
2. A bit more details are added to README.android for the reference.

This CL requires a pdfium change (the way it includes FT header
files : https://googleplex-android-review.git.corp.google.com/#/c/846889

An AOSP master CL 
(https://android-review.googlesource.com/#/c/196504/) is ported
to mnc-dev.

Bug: 24296662

Change-Id: Iec6784838d89098f332e6d1ed79663efd91a8441
Signed-off-by: Jungshik Shin <jungshik@google.com>
2016-01-20 17:30:59 +00:00
Jungshik Shin
36b415ed6c [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3
1. Update to a512b0fe7a (several patches past 2.6.2) from 2.5.3 + update
   (e1394d567)
   
   Major changes include
   - stem-darkening is OFF for CFF fonts by default
   - general code tightening
   - header file location is back to include/freetype (they used be include/)
   - autohinting improvement
2. A bit more details are added to README.android for the reference.
3. Update CleanSpec.mk from mnc/master.

The size of libft2.so : 16,384 bytes increase from 361,716 to 378,100.

master CL (https://android-review.googlesource.com/#/c/196504/) is ported
to lmp-dev branch.

Bug: 24296662

Change-Id: I5c0112a6c0a4d6bd43e708ff2f631eb4184f5b96
Signed-off-by: Jungshik Shin <jungshik@google.com>
2016-01-20 17:29:31 +00:00
jungshik
aba9adcf1e Merge "Update the version number in Android.mk"
am: 638ea6c202

* commit '638ea6c2028a6b5b961f07508b0e1e14d7dc62b8':
  Update the version number in Android.mk
2016-01-18 12:13:55 +00:00
jungshik
638ea6c202 Merge "Update the version number in Android.mk" 2016-01-18 12:08:27 +00:00
Jungshik Shin
d76856dc04 Update the version number in Android.mk
The previous update to FreeType 2.6.2+update didn't update
the version number in Android.mk

BUG=24296662

Change-Id: I6c71d8f5c57126b20bc7c03ecfc6437837498c89
Signed-off-by: Jungshik Shin <jungshik@google.com>
2016-01-18 01:54:45 -08:00
jungshik
d57fa79d70 Merge "Update FreeType to a512b0fe7a from 2.6.0"
am: a0bd57a383  -s ours

* commit 'a0bd57a38363fd1f6a6866bca38cc49e8f834f81':
  Update FreeType to a512b0fe7a from 2.6.0
2016-01-15 21:01:24 +00:00
jungshik
a0bd57a383 Merge "Update FreeType to a512b0fe7a from 2.6.0" 2016-01-15 19:37:45 +00:00
Jungshik Shin
0a38db3857 Update FreeType to a512b0fe7a from 2.6.0
1. Update to a512b0fe7a (several patches past 2.6.2). Major changes include
   - stem-darkening is OFF for CFF fonts by default
   - general code tightening
   - header file location is back to include/freetype (they used be include/)
2. A bit more details are added to README.android for the reference.

This CL requires a pdfium change (the way it includes FT header
files : https://android-review.googlesource.com/#/c/196608/ )

BUG=24296662

Change-Id: I9d52999c4c5371e70802907eb47205d8e7b0e581
Signed-off-by: Jungshik Shin <jungshik@google.com>
2016-01-15 00:32:01 +00:00
Bill Napier
f110ccadb8 Merge "package version metadata for external/" 2015-07-30 19:27:43 +00:00
Makoto Onuki
c456a16adf am db169b02: am ec62c527: Update to freetype 2.6.0
* commit 'db169b026ee309d79d5fe5c1c799f11bfc646295':
  Update to freetype 2.6.0
2015-06-11 01:33:21 +00:00
Makoto Onuki
db169b026e am ec62c527: Update to freetype 2.6.0
* commit 'ec62c527eb34ee4481a0153ceb42dfd35d7e1d26':
  Update to freetype 2.6.0
2015-06-10 23:17:50 +00:00
Makoto Onuki
edaa0194ac am 1330e4e7: am 18842aab: Merge "Update to freetype 2.6.0"
* commit '1330e4e74be943cc861e8e60e335bdf8d52983d6':
  Update to freetype 2.6.0
2015-06-10 22:57:59 +00:00
Makoto Onuki
1330e4e74b am 18842aab: Merge "Update to freetype 2.6.0"
* commit '18842aab597e368aab097e03643790c74962a71e':
  Update to freetype 2.6.0
2015-06-10 22:47:56 +00:00
Makoto Onuki
ec62c527eb Update to freetype 2.6.0
Bug 18751561

Change-Id: I871cc2925dc5908ec48073e11ecffad1924bbf50
2015-06-10 14:52:29 -07:00
Makoto Onuki
18842aab59 Merge "Update to freetype 2.6.0" 2015-06-10 21:25:01 +00:00
Makoto Onuki
fb6b5b10aa Update to freetype 2.6.0
Bug 18751561

Change-Id: Ia8c081f8fd38a1f78c72d30234c5ace8cfffe6a9
2015-06-10 12:47:57 -07:00