Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix -Wstringop-overflow= warnings #21

Merged
merged 1 commit into from
Jan 21, 2023
Merged

Fix -Wstringop-overflow= warnings #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/ttf2pt1/pt1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4907,7 +4907,8 @@ fcrossraysxx(

int
fcrossrayscv(
double curve[4][2 /*X,Y*/],
// double curve[4][2 /*X,Y*/],
double (*curve)[2 /*X,Y*/],
double *max1,
double *max2
)
Expand Down Expand Up @@ -4937,7 +4938,8 @@ fcrossraysge(
GENTRY *ge2,
double *max1,
double *max2,
double crossdot[2][2]
// double crossdot[2][2]
double (*crossdot)[2]
)
{
ray[0].x1 = ge1->prev->fx3;
Expand Down Expand Up @@ -4993,7 +4995,8 @@ printseg(

double
fdotsegdist2(
double seg[2][2 /*X,Y*/],
// double seg[2][2 /*X,Y*/],
double (*seg)[2 /*X,Y*/],
double dot[2 /*X,Y*/]
)
{
Expand Down Expand Up @@ -5085,7 +5088,8 @@ fdotsegdist2(

double
fdotcurvdist2(
double curve[4][2 /*X,Y*/ ],
// double curve[4][2 /*X,Y*/ ],
double (*curve)[2 /*X,Y*/ ],
struct dot_dist *dots,
int ndots, /* number of entries in dots */
double *maxp
Expand Down Expand Up @@ -5267,7 +5271,8 @@ fdotcurvdist2(

void
fapproxcurve(
double cv[4][2 /*X,Y*/ ], /* points 0-3 are passed in, points 1,2 - out */
// double cv[4][2 /*X,Y*/ ], /* points 0-3 are passed in, points 1,2 - out */
double (*cv)[2 /*X,Y*/ ], /* points 0-3 are passed in, points 1,2 - out */
struct dot_dist *dots, /* the dots to approximate - distances returned
* there may be invalid */
int ndots
Expand Down
16 changes: 11 additions & 5 deletions src/ttf2pt1/pt1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,15 @@ void docorrectwidth(void);
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 fcrossrayscv( double curve[4][2], double *max1, double *max2);
int fcrossrayscv( double (*curve)[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 fdotsegdist2( double seg[2][2], double dot[2]);
double fdotcurvdist2( double curve[4][2], struct dot_dist *dots, int ndots, double *maxp);
void fapproxcurve( double cv[4][2], struct dot_dist *dots, int ndots);
double (*crossdot)[2]);
// double fdotsegdist2( double seg[2][2], double dot[2]);
double fdotsegdist2( double (*seg)[2], double dot[2]);
// double fdotcurvdist2( double curve[4][2], struct dot_dist *dots, int ndots, double *maxp);
double fdotcurvdist2( double (*curve)[2], struct dot_dist *dots, int ndots, double *maxp);
// void fapproxcurve( double cv[4][2], struct dot_dist *dots, int ndots);
void fapproxcurve( double (*cv)[2], struct dot_dist *dots, int ndots);