From 2e74f5a8b818ae94d127a2bb0872adfe58b9c833 Mon Sep 17 00:00:00 2001 From: Winston Chang Date: Mon, 19 Jul 2021 12:13:44 -0500 Subject: [PATCH] Another false positive workaround --- src/ttf2pt1/pt1.c | 7 ++++--- src/ttf2pt1/pt1.h | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ttf2pt1/pt1.c b/src/ttf2pt1/pt1.c index 27f40de..b36cd2a 100644 --- a/src/ttf2pt1/pt1.c +++ b/src/ttf2pt1/pt1.c @@ -4937,7 +4937,8 @@ fcrossraysge( GENTRY *ge2, double *max1, double *max2, - double crossdot[2][2] + double** crossdot + // double crossdot[2][2] ) { ray[0].x1 = ge1->prev->fx3; @@ -4957,7 +4958,7 @@ fcrossraysge( } ray[1].maxp = max2; - return fcrossraysxx(crossdot); + return fcrossraysxx((double (*)[2])crossdot); } /* debugging printout functions */ @@ -6047,7 +6048,7 @@ fconcisecontour( fnormalizege(&tpge); fnormalizege(&tnge); - if( fcrossraysge(&tpge, &tnge, NULL, NULL, &apcv[1]) ) { + if( fcrossraysge(&tpge, &tnge, NULL, NULL, (double**)&apcv[1]) ) { apcv[0][X] = tpge.bkwd->fx3; apcv[0][Y] = tpge.bkwd->fy3; /* apcv[1] and apcv[2] were filled by fcrossraysge() */ diff --git a/src/ttf2pt1/pt1.h b/src/ttf2pt1/pt1.h index 6920315..7f647db 100644 --- a/src/ttf2pt1/pt1.h +++ b/src/ttf2pt1/pt1.h @@ -250,8 +250,10 @@ void addkernpair( unsigned id1, unsigned id2, int unscval); void print_kerning( FILE *afm_file); int fcrossrayscv( double curve[4][2], double *max1, double *max2); +// int fcrossraysge( GENTRY *ge1, GENTRY *ge2, double *max1, double *max2, +// double crossdot[2][2]); int fcrossraysge( GENTRY *ge1, GENTRY *ge2, double *max1, double *max2, - double crossdot[2][2]); + double** crossdot); // double fdotsegdist2( double seg[2][2], double dot[2]); double fdotsegdist2( double** seg, double dot[2]); double fdotcurvdist2( double curve[4][2], struct dot_dist *dots, int ndots, double *maxp);