diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-18 03:53:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-18 03:53:35 +0000 |
| commit | 5d42c812008cbf91dcbacd53840bdd0c90824638 (patch) | |
| tree | ae363805e8be7812ad3a88ff8f28cd1380d7ac92 /src/sdf/ftsdf.c | |
| parent | 513d7bfe752f5167ec3fe0d4cca2c7949e229342 (diff) | |
| parent | 8e77a75afbfbe76ed641379d5f73b92cbf37d006 (diff) | |
| download | freetype-5d42c812008cbf91dcbacd53840bdd0c90824638.tar.gz | |
Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95 am: 6487a5bb15 am: 8e77a75afb
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273
Change-Id: Ic1776aff7be0afc5c84f9f61754023c5557998ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/sdf/ftsdf.c')
| -rw-r--r-- | src/sdf/ftsdf.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/sdf/ftsdf.c b/src/sdf/ftsdf.c index 26a6d00e4..bc4625d98 100644 --- a/src/sdf/ftsdf.c +++ b/src/sdf/ftsdf.c @@ -2371,11 +2371,11 @@ * ``` * * (6) Our task is to find a value of `t` such that the above equation - * `Q(t)` becomes zero, this is, the point-to-curve vector makes + * `Q(t)` becomes zero, that is, the point-to-curve vector makes * 90~degrees with the curve. We solve this with the Newton-Raphson * method. * - * (7) We first assume an arbitary value of factor `t`, which we then + * (7) We first assume an arbitrary value of factor `t`, which we then * improve. * * ``` @@ -2684,11 +2684,11 @@ * ``` * * (6) Our task is to find a value of `t` such that the above equation - * `Q(t)` becomes zero, this is, the point-to-curve vector makes + * `Q(t)` becomes zero, that is, the point-to-curve vector makes * 90~degree with curve. We solve this with the Newton-Raphson * method. * - * (7) We first assume an arbitary value of factor `t`, which we then + * (7) We first assume an arbitrary value of factor `t`, which we then * improve. * * ``` @@ -2718,8 +2718,9 @@ FT_Error error = FT_Err_Ok; - FT_26D6_Vec aA, bB, cC, dD; /* A, B, C in the above comment */ - FT_16D16_Vec nearest_point; /* point on curve nearest to `point` */ + FT_26D6_Vec aA, bB, cC, dD; /* A, B, C, D in the above comment */ + FT_16D16_Vec nearest_point = { 0, 0 }; + /* point on curve nearest to `point` */ FT_16D16_Vec direction; /* direction of curve at `nearest_point` */ FT_26D6_Vec p0, p1, p2, p3; /* control points of a cubic curve */ @@ -3761,9 +3762,13 @@ */ static FT_Error - sdf_raster_new( FT_Memory memory, - SDF_PRaster* araster ) + sdf_raster_new( void* memory_, /* FT_Memory */ + FT_Raster* araster_ ) /* SDF_PRaster* */ { + FT_Memory memory = (FT_Memory)memory_; + SDF_PRaster* araster = (SDF_PRaster*)araster_; + + FT_Error error; SDF_PRaster raster = NULL; |