diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2023-04-06 03:17:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-06 03:17:29 +0000 |
| commit | e0843e47c2daaa7a103580b544a847e00ee67e58 (patch) | |
| tree | bef33f3f97982b201c0c4d1b26ac7cdcafc9cb02 | |
| parent | 462f9fc43d16b984f3cd0a420fc4f48a8008af73 (diff) | |
| parent | db82c946f712b317bd86ce8f05e1643f92b3eb02 (diff) | |
| download | freetype-android13-qpr3-c-s2-release.tar.gz | |
Merge "Cherry-pick one upstream change" into tm-qpr-devandroid-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s1-release
| -rw-r--r-- | src/sfnt/sfobjs.c | 2 | ||||
| -rw-r--r-- | src/sfnt/sfwoff2.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index 789102479..ea17ca8f4 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -566,7 +566,7 @@ face_index = FT_ABS( face_instance_index ) & 0xFFFF; /* value -(N+1) requests information on index N */ - if ( face_instance_index < 0 ) + if ( face_instance_index < 0 && face_index > 0 ) face_index--; if ( face_index >= face->ttc_header.count ) diff --git a/src/sfnt/sfwoff2.c b/src/sfnt/sfwoff2.c index 5ee8dea28..2da697d69 100644 --- a/src/sfnt/sfwoff2.c +++ b/src/sfnt/sfwoff2.c @@ -2086,7 +2086,7 @@ /* Validate requested face index. */ *num_faces = woff2.num_fonts; /* value -(N+1) requests information on index N */ - if ( *face_instance_index < 0 ) + if ( *face_instance_index < 0 && face_index > 0 ) face_index--; if ( face_index >= woff2.num_fonts ) |