From fea0f7addaa7ce33d8a6e9f7d589a625d945356d Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sun, 19 Dec 2021 20:03:48 -0800 Subject: [PATCH] gvrender_usershape: [nfc] take a C99 bool parameter instead of a boolean --- lib/common/htmltable.c | 2 +- lib/common/shapes.c | 2 +- lib/gvc/gvcproc.h | 2 +- lib/gvc/gvrender.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c index da6865d7f..e92ae3c43 100644 --- a/lib/common/htmltable.c +++ b/lib/common/htmltable.c @@ -619,7 +619,7 @@ static void emit_html_img(GVJ_t * job, htmlimg_t * cp, htmlenv_t * env) scale = env->imgscale; assert(cp->src); assert(cp->src[0]); - gvrender_usershape(job, cp->src, A, 4, TRUE, scale, "mc"); + gvrender_usershape(job, cp->src, A, 4, true, scale, "mc"); } static void emit_html_cell(GVJ_t * job, htmlcell_t * cp, htmlenv_t * env) diff --git a/lib/common/shapes.c b/lib/common/shapes.c index ff603e276..b096af0a3 100644 --- a/lib/common/shapes.c +++ b/lib/common/shapes.c @@ -2944,7 +2944,7 @@ static void poly_gencode(GVJ_t * job, node_t * n) gvrender_polygon(job, AF, sides, filled); } } - gvrender_usershape(job, name, AF, sides, filled, + gvrender_usershape(job, name, AF, sides, filled != FALSE, late_string(n, N_imagescale, "false"), late_string(n, N_imagepos, "mc")); filled = FALSE; /* with user shapes, we have done the fill if needed */ diff --git a/lib/gvc/gvcproc.h b/lib/gvc/gvcproc.h index eb92100bd..447a0436d 100644 --- a/lib/gvc/gvcproc.h +++ b/lib/gvc/gvcproc.h @@ -109,7 +109,7 @@ int arrow_at_start, int arrow_at_end, int filled); void gvrender_polyline(GVJ_t * job, pointf * AF, int n); void gvrender_comment(GVJ_t * job, char *str); - void gvrender_usershape(GVJ_t * job, char *name, pointf * AF, int n, boolean filled, char *imagescale, char *imagepos); + void gvrender_usershape(GVJ_t * job, char *name, pointf * AF, int n, bool filled, char *imagescale, char *imagepos); /* layout */ diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c index 77395a770..8208de69b 100644 --- a/lib/gvc/gvrender.c +++ b/lib/gvc/gvrender.c @@ -695,7 +695,7 @@ static imagepos_t get_imagepos(char *s) * positioned at "imagepos" */ void gvrender_usershape(GVJ_t * job, char *name, pointf * a, int n, - boolean filled, char *imagescale, char *imagepos) + bool filled, char *imagescale, char *imagepos) { gvrender_engine_t *gvre = job->render.engine; usershape_t *us; -- 2.40.0