From b153b7699c9d945ff726598511780c382808a4b5 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sun, 16 Feb 2020 11:52:59 +0100 Subject: [PATCH] some missing brackets, typos --- src/frontend/plotting/graf.c | 4 ++-- src/frontend/plotting/plotit.c | 11 +++-------- src/frontend/wdisp/windisp.c | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c index 8732c108b..8e2ab37e6 100644 --- a/src/frontend/plotting/graf.c +++ b/src/frontend/plotting/graf.c @@ -79,7 +79,7 @@ int gr_init(double *xlims, double *ylims, /* The size of the screen. */ const char *ylabel, /* Labels for axes. */ int xtype, int ytype, /* The types of the data graphed. */ const char *pname, - const char *commandline) /* For xi_zoomdata() */ + const char *commandline, /* For xi_zoomdata() */ int prevgraph) /* plot id, if started from a previous plot*/ { GRAPH *graph; @@ -762,7 +762,7 @@ static int iplot(struct plot *pl, int id) (void) gr_init(xlims, ylims, xs->v_name, pl->pl_title, NULL, n_vec_plot, 0.0, 0.0, GRID_LIN, PLOT_LIN, xs->v_name, yl, xs->v_type, yt, - plot_cur->pl_typename, commandline); + plot_cur->pl_typename, commandline, 0); for (v = pl->pl_dvecs; v; v = v->v_next) { if (v->v_flags & VF_PLOT) { diff --git a/src/frontend/plotting/plotit.c b/src/frontend/plotting/plotit.c index 5bf27ada3..6de95aafd 100644 --- a/src/frontend/plotting/plotit.c +++ b/src/frontend/plotting/plotit.c @@ -275,14 +275,9 @@ bool plotit(wordlist *wl, const char *hcopy, const char *devname) return FALSE; } - /* All these things are static so that "samep" will work. - static double *xcompress = NULL, *xindices = NULL; - static double *xlim = NULL, *ylim = NULL, *xynull; - static double *xdelta = NULL, *ydelta = NULL; - static char *xlabel = NULL, *ylabel = NULL, *title = NULL; - static double *xprevgraph = NULL;*/ - + static double *xprevgraph = NULL; int prevgraph = 0; + static bool nointerp = FALSE; static GRIDTYPE gtype = GRID_LIN; static PLOTTYPE ptype = PLOT_LIN; @@ -333,7 +328,7 @@ bool plotit(wordlist *wl, const char *hcopy, const char *devname) nylabel = getword(wwl, "ylabel"); ntitle = getword(wwl, "title"); /* remove sgraphid */ - txfee(getlims(wwl, "sgraphid", 1)); + txfree(getlims(wwl, "sgraphid", 1)); /* Build the plot command. This construction had been done with wordlists * and reversing, and flattening, but it is clearer as well as much more diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c index 7ed7d576d..8ea6824d2 100644 --- a/src/frontend/wdisp/windisp.c +++ b/src/frontend/wdisp/windisp.c @@ -412,7 +412,7 @@ LRESULT CALLBACK PlotWindowProc(HWND hwnd, UINT uMsg, hdc = GetDC(hwnd); GRAPH* gr = pGraph(hwnd); isblack = get_black(gr); - if (isblack) + if (isblack) { prevmix = SetROP2(hdc, R2_XORPEN); } else {