From a3a8bc702d663c2cade632dc5d5b19f760bbfe33 Mon Sep 17 00:00:00 2001 From: Jim Monte Date: Sat, 25 Apr 2020 19:14:31 +0200 Subject: [PATCH] type modifier, parameter graph removed from SetColor() --- src/frontend/dimens.c | 8 ++++---- src/frontend/display.c | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/frontend/dimens.c b/src/frontend/dimens.c index 4df084fff..07f2a9f1b 100644 --- a/src/frontend/dimens.c +++ b/src/frontend/dimens.c @@ -213,7 +213,7 @@ static int atodims_bracketed(const char *p, int *data, int *p_n_dim) int rc = get_bracketed_dim(p, data + n_dim); if (rc <= 0) { /* error or normal exit */ - *p_n_dim = n_dim; + *p_n_dim = (int) n_dim; return !!rc; } p += rc; /* step after the dimension that was processed */ @@ -283,10 +283,10 @@ static int atodims_csv(const char *p, int *data, int *p_n_dim) ++p; break; case ']': /* ] ended scan */ - *p_n_dim = n_dim; + *p_n_dim = (int) n_dim; return (int) (p - p0) + 1; case '\0': /* end of string ended scan */ - *p_n_dim = n_dim; + *p_n_dim = (int) n_dim; return 0; default: /* invalid char */ return -1; @@ -347,7 +347,7 @@ static int get_dim(const char *p, int *p_val) const char *p0 = p; for ( ; ; ++p) { const char c_cur = *p; - unsigned int digit_cur = c_cur - '0'; + unsigned int digit_cur = (unsigned int) (c_cur - '0'); unsigned int val_new; if (digit_cur > 9) { /* not a digit */ if ((*p_val = (int) val) < 0) { /* overflow */ diff --git a/src/frontend/display.c b/src/frontend/display.c index 797cd0103..9ad29be0a 100644 --- a/src/frontend/display.c +++ b/src/frontend/display.c @@ -246,10 +246,9 @@ DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta) } -void -DevDrawText(char *text, int x, int y, int angle) +void DevDrawText(const char *text, int x, int y, int angle) { - dispdev->DrawText (text, x, y, angle); + dispdev->DrawText(text, x, y, angle); } @@ -275,9 +274,9 @@ SetLinestyle(int linestyleid) void -SetColor(int colorid, GRAPH *graph) +SetColor(int colorid) { - dispdev->SetColor (colorid, graph); + dispdev->SetColor(colorid); }