]> granicus.if.org Git - graphviz/log
graphviz
2 years agoMerge branch 'smattr/0E5378C5-27A2-4E7A-A4A8-8BC527899AF6' into 'main'
Matthew Fernandez [Sun, 27 Mar 2022 19:40:35 +0000 (19:40 +0000)]
Merge branch 'smattr/0E5378C5-27A2-4E7A-A4A8-8BC527899AF6' into 'main'

smyrna: clean up and warning squashing

See merge request graphviz/graphviz!2533

2 years agocmd/smyrna: remove unused return value from 'close_graph'
Matthew Fernandez [Sun, 27 Mar 2022 18:22:34 +0000 (11:22 -0700)]
cmd/smyrna: remove unused return value from 'close_graph'

2 years agocmd/smyrna/viewport.c: fix -Wnon-literal-null-conversion with Clang
Matthew Fernandez [Sat, 26 Mar 2022 19:46:23 +0000 (12:46 -0700)]
cmd/smyrna/viewport.c: fix -Wnon-literal-null-conversion with Clang

This was causing the CMake build (to be enabled in a future commit) on macOS to
fail.

Gitlab: #1836, #1854

2 years agocmd/smyrna: fix a comment typo
Matthew Fernandez [Sat, 26 Mar 2022 18:08:11 +0000 (11:08 -0700)]
cmd/smyrna: fix a comment typo

2 years agocmd/smyrna: fix -Wnon-literal-null-conversion with Clang
Matthew Fernandez [Sat, 26 Mar 2022 18:07:00 +0000 (11:07 -0700)]
cmd/smyrna: fix -Wnon-literal-null-conversion with Clang

This was causing the CMake build (to be enabled in a future commit) on macOS to
fail.

Gitlab: #1836, #1854

2 years agocmd/smyrna: remove no-op if statement
Matthew Fernandez [Sat, 26 Mar 2022 15:39:20 +0000 (08:39 -0700)]
cmd/smyrna: remove no-op if statement

When enabling Smyrna in the CMake build system, compilation fails with a
-Wempty-body warning about this line. I am guessing that it was intended to not
be a conditional here.

Gitlab: #1836, #1854

2 years agofix: teach Smyrna '-?' on macOS and Windows
Matthew Fernandez [Sat, 26 Mar 2022 15:13:30 +0000 (08:13 -0700)]
fix: teach Smyrna '-?' on macOS and Windows

This is the equivalent of cd80b6262c7e1b95307756f13c89a9f6b2900520 and friends
but for Smyrna. It was not previously detected that this problem also affects
Smyrna because it is not currently built on macOS or Windows in CI. This will be
improved in future.

Gitlab: #1852

2 years agolib/glcomp: fix -Wnon-literal-null-conversion with Clang
Matthew Fernandez [Sat, 26 Mar 2022 00:30:58 +0000 (17:30 -0700)]
lib/glcomp: fix -Wnon-literal-null-conversion with Clang

This was causing the CMake build (to be enabled in a future commit) on macOS to
fail.

Gitlab: #1836, #1854

2 years agolib/glcomp: remove unused 'glCompButton.customptr'
Matthew Fernandez [Sat, 26 Mar 2022 00:28:25 +0000 (17:28 -0700)]
lib/glcomp: remove unused 'glCompButton.customptr'

With Clang on macOS, this causes compiler warnings due to initializing a pointer
with `'\0'`. This fails the CMake build which will be enabled in a future
commit. We could rephrase this, but it is simpler to just remove this unused
member.

Gitlab: #1836, #1854

2 years agosmyrna: remove unnecessary 'gpointer' cast
Matthew Fernandez [Sat, 26 Mar 2022 19:52:56 +0000 (12:52 -0700)]
smyrna: remove unnecessary 'gpointer' cast

`gpointer` is just a typedef for `void*` that implicitly coerces to all other
pointer types.

2 years agosmyrma: remove unnecessary 'gint' cast
Matthew Fernandez [Sat, 26 Mar 2022 19:50:16 +0000 (12:50 -0700)]
smyrma: remove unnecessary 'gint' cast

`G_PRIORITY_DEFAULT` is already a `gint` (typedef for `int`).

2 years agosmyrna: remove use of 'guint' cast
Matthew Fernandez [Sat, 26 Mar 2022 19:48:28 +0000 (12:48 -0700)]
smyrna: remove use of 'guint' cast

`guint` is just a Glib typedef for `unsigned int`. So we can write this simpler.

2 years agoMerge branch 'smattr/1D9B0E32-37CA-4547-A966-AE877344C814' into 'main'
Matthew Fernandez [Sun, 27 Mar 2022 18:12:06 +0000 (18:12 +0000)]
Merge branch 'smattr/1D9B0E32-37CA-4547-A966-AE877344C814' into 'main'

tests: remove unused cdiff.c

See merge request graphviz/graphviz!2532

2 years agotests: remove unused cdiff.c
Matthew Fernandez [Sat, 26 Mar 2022 20:08:17 +0000 (13:08 -0700)]
tests: remove unused cdiff.c

2 years agoMerge branch 'smattr/63D62C3D-D094-4ED8-A675-538D7283B9E6' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 19:58:17 +0000 (19:58 +0000)]
Merge branch 'smattr/63D62C3D-D094-4ED8-A675-538D7283B9E6' into 'main'

use suffixed literals instead of casts to construct 'GLfloat' values

See merge request graphviz/graphviz!2530

2 years agouse suffixed literals instead of casts to construct 'GLfloat' values
Matthew Fernandez [Fri, 25 Mar 2022 05:13:05 +0000 (22:13 -0700)]
use suffixed literals instead of casts to construct 'GLfloat' values

The `GLfloat` type is 32-bit IEEE-754 floating-point.¹ As of C99, the `float`
type is also 32-bit IEEE-754 floating-point on all platforms with support.² In
contemporary usage, this is effectively all C99 platforms that support
floating-point arithmetic. Graphviz has been compiled in C99 mode since commit
fe3f9411d2c59b463ab1b64eecfd19f2db55d2fc. Putting those things together, we can
abbreviate the way we write `GLfloat` literals, leading to more readable code.

¹ https://www.khronos.org/opengl/wiki/OpenGL_Type
² https://en.wikipedia.org/wiki/C99#IEEE_754_floating-point_support

2 years agoMerge branch 'smattr/26236D4A-346B-44B1-ACAB-ED8D7E59E09E' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 18:27:02 +0000 (18:27 +0000)]
Merge branch 'smattr/26236D4A-346B-44B1-ACAB-ED8D7E59E09E' into 'main'

gvc: remove unused unistd.h #include

See merge request graphviz/graphviz!2531

2 years agogvc: remove unused unistd.h #include
Matthew Fernandez [Sat, 26 Mar 2022 03:16:51 +0000 (20:16 -0700)]
gvc: remove unused unistd.h #include

Gitlab: #2204

2 years agoMerge branch 'smattr/9691B69C-F05E-4819-B327-8258BB2B3D23' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 15:45:29 +0000 (15:45 +0000)]
Merge branch 'smattr/9691B69C-F05E-4819-B327-8258BB2B3D23' into 'main'

move XML validation tests into a separate CI job

Closes #2216

See merge request graphviz/graphviz!2527

2 years agomove XML validation tests into a separate CI job
Matthew Fernandez [Wed, 23 Mar 2022 00:42:32 +0000 (17:42 -0700)]
move XML validation tests into a separate CI job

This parametrized test was checking the validity of checked in Graphviz HTML
sources. There is no need to run this identical check in every single CI test
job nor on end users machines where they may have differing versions of
`xmllint` installed.

Gitlab: closes #2216

2 years agoMerge branch 'smattr/A0DB9535-2265-4E6C-9389-16058C1BB35B' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 06:47:53 +0000 (06:47 +0000)]
Merge branch 'smattr/A0DB9535-2265-4E6C-9389-16058C1BB35B' into 'main'

towards enabling Smyrna in CMake

See merge request graphviz/graphviz!2526

2 years agosmyrna Init: squash -Wincompatible-pointer-types
Matthew Fernandez [Mon, 21 Mar 2022 15:09:55 +0000 (08:09 -0700)]
smyrna Init: squash -Wincompatible-pointer-types

OpenGL has an unorthodox API wherein the `gluTessCallback` function’s prototype
indicates it takes a `void(*)(void)`, but its docs¹ explain that the type
actually varies depending on the second argument. As a result, the compiler
(correctly) warns that some of these `gluTessCallback` calls are passing
function pointers that do not have the same ABI. Presumably this works out
because at the end of the day a function pointer is just some bits in C and the
OpenGL implementation branches on the `which` argument and invokes the pointer
correctly. But if OpenGL really wanted to discard type safety this way, it is
not clear to me why they did not make the function pointer argument a `void*`.
Anyway, this commit squashes the compiler warnings which emerge when enabling
this in the CMake build system, failing the build.

Gitlab: related to #1836

¹ This is not the authoritative source, but Microsoft’s docs for their
  implementation provide a good explanation.
  https://docs.microsoft.com/en-us/windows/win32/opengl/glutess

2 years agosmyrna cb_mouseclick: remove unused 'g'
Matthew Fernandez [Mon, 21 Mar 2022 14:57:22 +0000 (07:57 -0700)]
smyrna cb_mouseclick: remove unused 'g'

This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agosmyrna on_attrAddBtn_clicked: remove unused 'value'
Matthew Fernandez [Mon, 21 Mar 2022 14:49:00 +0000 (07:49 -0700)]
smyrna on_attrAddBtn_clicked: remove unused 'value'

This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agosmyrna: remove unused 'gvpr_select'
Matthew Fernandez [Mon, 21 Mar 2022 14:33:28 +0000 (07:33 -0700)]
smyrna: remove unused 'gvpr_select'

The last use of this was removed in 7e1f01ad52915498a252dd213f85daf5a058aa5d.
This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agosmyrna on_attrAddBtn_clicked: remove unused 'prog'
Matthew Fernandez [Mon, 21 Mar 2022 14:31:31 +0000 (07:31 -0700)]
smyrna on_attrAddBtn_clicked: remove unused 'prog'

This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agosmyrna doApply: remove unused 't'
Matthew Fernandez [Mon, 21 Mar 2022 14:29:04 +0000 (07:29 -0700)]
smyrna doApply: remove unused 't'

This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agocmd/smyrna: remove some unnecessary intermediate buffers
Matthew Fernandez [Mon, 21 Mar 2022 04:42:28 +0000 (21:42 -0700)]
cmd/smyrna: remove some unnecessary intermediate buffers

2 years agocmd/smyrna: remove some excess white space
Matthew Fernandez [Mon, 21 Mar 2022 04:42:02 +0000 (21:42 -0700)]
cmd/smyrna: remove some excess white space

2 years agocmd/smyrna: remove some open coded 'NULL'
Matthew Fernandez [Mon, 21 Mar 2022 04:41:08 +0000 (21:41 -0700)]
cmd/smyrna: remove some open coded 'NULL'

2 years agoCI: install libglade on CentOS 7, enabling lib/glcomp
Matthew Fernandez [Mon, 21 Mar 2022 02:18:25 +0000 (19:18 -0700)]
CI: install libglade on CentOS 7, enabling lib/glcomp

A step on the way towards enabling Smyrna in the CMake build.

Gitlab: #1836

2 years agoCMake: enable lib/glcomp
Matthew Fernandez [Sun, 20 Mar 2022 23:37:07 +0000 (16:37 -0700)]
CMake: enable lib/glcomp

Interestingly enabling this revealed that lib/glcomp also depends on Pango,
something unexpressed in either the Autotools or MS Build build systems.

Gitlab: #1836

2 years agolib/glcomp: remove gtkglext CFLAGS tweak
Matthew Fernandez [Mon, 21 Mar 2022 00:07:06 +0000 (17:07 -0700)]
lib/glcomp: remove gtkglext CFLAGS tweak

As far as I can tell, glcomp does not use gtkglext. Smyrna, which depends on
glcomp, does. But Smyrna specifies its own linking against gtkglext.

2 years agolib/glcomp: remove unnecessary 'static' from some variables
Matthew Fernandez [Mon, 21 Mar 2022 04:35:20 +0000 (21:35 -0700)]
lib/glcomp: remove unnecessary 'static' from some variables

These are unconditionally overwritten during their respective functions before
they are ever read.

2 years agolib/glcomp: remove unnecessary parens
Matthew Fernandez [Mon, 21 Mar 2022 04:34:55 +0000 (21:34 -0700)]
lib/glcomp: remove unnecessary parens

2 years agolib/glcomp: remove some unnecessary casts
Matthew Fernandez [Mon, 21 Mar 2022 04:34:02 +0000 (21:34 -0700)]
lib/glcomp: remove some unnecessary casts

2 years agolib/glcomp: remove some open coded 'NULL'
Matthew Fernandez [Mon, 21 Mar 2022 04:33:21 +0000 (21:33 -0700)]
lib/glcomp: remove some open coded 'NULL'

2 years agolib/glcomp: remove some duplicate #includes
Matthew Fernandez [Sun, 20 Mar 2022 23:59:01 +0000 (16:59 -0700)]
lib/glcomp: remove some duplicate #includes

2 years agolib/glcomp: remove some trailing white space
Matthew Fernandez [Sun, 20 Mar 2022 23:58:44 +0000 (16:58 -0700)]
lib/glcomp: remove some trailing white space

2 years agolib/topfish: missing CMake dependencies
Matthew Fernandez [Tue, 22 Mar 2022 02:03:51 +0000 (19:03 -0700)]
lib/topfish: missing CMake dependencies

This seems to have been broken since CMake support for lib/topfish was
introduced in 45893ca105777e1c5b97788cd169e400250ffa1f. But it was never noticed
because there is no executable in the CMake build system that links against
topfish yet.

Gitlab: #1836

2 years agolib/topfish: fix CMakeLists.txt indentation
Matthew Fernandez [Tue, 22 Mar 2022 01:13:03 +0000 (18:13 -0700)]
lib/topfish: fix CMakeLists.txt indentation

Unclear why `cmakelang.lint` does not warn about this.

2 years agolib/topfish maxmatch: remove unused 'sum_weights'
Matthew Fernandez [Tue, 22 Mar 2022 01:43:47 +0000 (18:43 -0700)]
lib/topfish maxmatch: remove unused 'sum_weights'

This causes compiler warnings resulting in build failure when enabling this in
the CMake build system.

Gitlab: related to #1836

2 years agoremove unused 'HAVE_GTKGLEXT'
Matthew Fernandez [Sun, 20 Mar 2022 23:18:31 +0000 (16:18 -0700)]
remove unused 'HAVE_GTKGLEXT'

Aside from being unused, it is unclear why the Windows config.h was defining
this given it does not define `HAVE_GTKGL`.

2 years agopathfind: remove an unnecessary cast
Matthew Fernandez [Mon, 21 Mar 2022 04:45:17 +0000 (21:45 -0700)]
pathfind: remove an unnecessary cast

2 years agoMerge branch 'smattr/E88122C7-BB84-4919-9B41-D44586D94783' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 03:26:59 +0000 (03:26 +0000)]
Merge branch 'smattr/E88122C7-BB84-4919-9B41-D44586D94783' into 'main'

CMake: enable edgepaint

See merge request graphviz/graphviz!2525

2 years agoCMake: add cmd/edgepaint compilation
Matthew Fernandez [Sat, 19 Mar 2022 21:06:49 +0000 (14:06 -0700)]
CMake: add cmd/edgepaint compilation

Gitlab: #1836

2 years agoCMake: enable lib/edgepaint compilation
Matthew Fernandez [Sat, 19 Mar 2022 20:47:17 +0000 (13:47 -0700)]
CMake: enable lib/edgepaint compilation

Note that the target here is named “edgepaintib” in anticipation of future
enabling of cmd/edgepaint claiming the name “edgepaint”. This also does not
define a separate liblab_gamut, as the Autotools build does. This separate
library seems only useful for cmd/edgepaint, so it does not seem worth splitting
it out as a separate library.

Gitlab: #1836

2 years agolib/edgepaint: remove linking against libANN
Matthew Fernandez [Sat, 19 Mar 2022 21:04:17 +0000 (14:04 -0700)]
lib/edgepaint: remove linking against libANN

For the same motivation as the prior commit, this is unused.

2 years agolib/edgepaint: remove application of ANN’s CFLAGS
Matthew Fernandez [Sat, 19 Mar 2022 20:42:49 +0000 (13:42 -0700)]
lib/edgepaint: remove application of ANN’s CFLAGS

This seems to have been a mistake in aadee957012e676c9aaf36ec40cb2860c178e269.
lib/edgepaint does not depend on libANN, so it does not seem correct to apply
ANN’s CFLAGS when compiling it.

2 years agoMerge branch 'smattr/71744FB7-FA95-46C5-949E-64F986D85872' into 'main'
Matthew Fernandez [Sat, 26 Mar 2022 01:40:28 +0000 (01:40 +0000)]
Merge branch 'smattr/71744FB7-FA95-46C5-949E-64F986D85872' into 'main'

test case for #2215

See merge request graphviz/graphviz!2521

2 years agogvParseArgs etc: use a clearer idiom for accessing characters of 'arg'
Matthew Fernandez [Sat, 19 Mar 2022 17:45:02 +0000 (10:45 -0700)]
gvParseArgs etc: use a clearer idiom for accessing characters of 'arg'

2 years agogvParseArgs etc: remove tests for 'NULL' members in 'argv'
Matthew Fernandez [Sat, 19 Mar 2022 17:42:24 +0000 (10:42 -0700)]
gvParseArgs etc: remove tests for 'NULL' members in 'argv'

The strings in `argv` within the range of `argc` are guaranteed non-null.

2 years agoadd a test case for #2215
Matthew Fernandez [Sat, 19 Mar 2022 17:38:56 +0000 (10:38 -0700)]
add a test case for #2215

2 years agoMerge branch 'smattr/875065A8-89A1-453D-9A36-2C2A8E259B84' into 'main'
Matthew Fernandez [Fri, 25 Mar 2022 15:56:17 +0000 (15:56 +0000)]
Merge branch 'smattr/875065A8-89A1-453D-9A36-2C2A8E259B84' into 'main'

gvpr: remove some sfio, unistd.h dependencies

See merge request graphviz/graphviz!2523

2 years agogvpr: rewrite debug graph processing to use stdio instead of sfio
Matthew Fernandez [Sun, 20 Mar 2022 01:36:40 +0000 (18:36 -0700)]
gvpr: rewrite debug graph processing to use stdio instead of sfio

This cuts a dependency on sfio, as well as a dependency on non-portable unistd.h
functions.

Gitlab: #1998, #2204

2 years agogvpr: rewrite debug I/O output to use stdio instead of unistd
Matthew Fernandez [Sun, 20 Mar 2022 01:29:07 +0000 (18:29 -0700)]
gvpr: rewrite debug I/O output to use stdio instead of unistd

There is no need to use the lower level `write` API for this I/O. By using
`fprintf` instead, we avoid a dependency on non-portable unistd.h.

Gitlab: #2204

2 years agoMerge branch 'smattr/B24E1807-D40B-483F-8529-60C8EB2E4707' into 'main'
Matthew Fernandez [Fri, 25 Mar 2022 05:45:09 +0000 (05:45 +0000)]
Merge branch 'smattr/B24E1807-D40B-483F-8529-60C8EB2E4707' into 'main'

further pathcanon clean up and remove strings.h detection

See merge request graphviz/graphviz!2522

2 years agoremove no longer used strings.h detection
Matthew Fernandez [Sat, 19 Mar 2022 20:19:33 +0000 (13:19 -0700)]
remove no longer used strings.h detection

2 years agorender.h: remove unused strings.h #include
Matthew Fernandez [Sat, 19 Mar 2022 20:18:05 +0000 (13:18 -0700)]
render.h: remove unused strings.h #include

2 years agopathfind: remove unused strings.h #include
Matthew Fernandez [Sat, 19 Mar 2022 20:17:02 +0000 (13:17 -0700)]
pathfind: remove unused strings.h #include

2 years agopathcanon: remove unused 'loop' variable
Matthew Fernandez [Sat, 19 Mar 2022 20:13:17 +0000 (13:13 -0700)]
pathcanon: remove unused 'loop' variable

2 years agopathcanon: remove unnecessary 'errno' save and restore
Matthew Fernandez [Sat, 19 Mar 2022 20:12:20 +0000 (13:12 -0700)]
pathcanon: remove unnecessary 'errno' save and restore

a3db9ad8f8eb79a931f0bc6d087ca3b52de3dd62 removed any logic in this function that
affected `errno`. So there is no need to save and restore it anymore.

2 years agoMerge branch 'smattr/9E1814ED-8451-43CC-A7A1-AAF2BE8EDF86' into 'main'
Matthew Fernandez [Thu, 24 Mar 2022 16:52:38 +0000 (16:52 +0000)]
Merge branch 'smattr/9E1814ED-8451-43CC-A7A1-AAF2BE8EDF86' into 'main'

roll out cgraph allocation wrappers to edgepaint

See merge request graphviz/graphviz!2517

2 years agoccomps: abbreviate an open coded 'gv_strndup'
Matthew Fernandez [Fri, 18 Mar 2022 15:21:23 +0000 (08:21 -0700)]
ccomps: abbreviate an open coded 'gv_strndup'

2 years agocgraph: add a 'strndup' allocation wrapper
Matthew Fernandez [Fri, 18 Mar 2022 15:18:41 +0000 (08:18 -0700)]
cgraph: add a 'strndup' allocation wrapper

2 years agoedgepaint: free 'lightness' prior to exit
Matthew Fernandez [Thu, 17 Mar 2022 04:23:35 +0000 (21:23 -0700)]
edgepaint: free 'lightness' prior to exit

Some small progress to becoming leak-free even on clean exit.

2 years agoedgepaint: replace a 'strdup' with 'gv_strdup'
Matthew Fernandez [Thu, 17 Mar 2022 04:22:48 +0000 (21:22 -0700)]
edgepaint: replace a 'strdup' with 'gv_strdup'

This allocation was not handling failure and the only reasonable response here
is to exit.

2 years agocgraph: add a 'strdup' wrapper to the allocation helpers
Matthew Fernandez [Thu, 17 Mar 2022 04:21:01 +0000 (21:21 -0700)]
cgraph: add a 'strdup' wrapper to the allocation helpers

2 years agoMerge branch 'smattr/2E1672CD-0A70-45B7-8770-A81BE7638FA4' into 'main'
Matthew Fernandez [Sun, 20 Mar 2022 02:42:59 +0000 (02:42 +0000)]
Merge branch 'smattr/2E1672CD-0A70-45B7-8770-A81BE7638FA4' into 'main'

document 'SIGUSR1' handling

See merge request graphviz/graphviz!2515

2 years agodot: make a man page note about 'SIGUSR1' effects
Matthew Fernandez [Wed, 16 Mar 2022 14:42:01 +0000 (07:42 -0700)]
dot: make a man page note about 'SIGUSR1' effects

2 years agoselfRightSpace: consistently use a double for calculating self width
Matthew Fernandez [Mon, 14 Mar 2022 15:09:29 +0000 (08:09 -0700)]
selfRightSpace: consistently use a double for calculating self width

This avoids going backwards and forwards between double and int, which was
causing some compiler warnings and unnecessary loss of precision.

2 years agoMerge branch 'smattr/5d0e6877-4a8c-45a9-b1b5-f83e9328eeaf' into 'main'
Matthew Fernandez [Sat, 19 Mar 2022 21:54:37 +0000 (21:54 +0000)]
Merge branch 'smattr/5d0e6877-4a8c-45a9-b1b5-f83e9328eeaf' into 'main'

add Mingle to the CMake build system

See merge request graphviz/graphviz!2383

2 years agoadd Mingle to the CMake build system
Matthew Fernandez [Sat, 25 Dec 2021 19:25:29 +0000 (11:25 -0800)]
add Mingle to the CMake build system

Gitlab: related to #1835, #1836, #1854

2 years agoCI: install 'libANN' on macOS
Matthew Fernandez [Fri, 11 Mar 2022 14:53:49 +0000 (06:53 -0800)]
CI: install 'libANN' on macOS

This is a dependency of lib/mingle, and transitively cmd/mingle. Note that this
is not available through Homebrew so we need to use MacPorts.

2 years agoCI: move macOS dependency installation out of line
Matthew Fernandez [Fri, 11 Mar 2022 14:49:26 +0000 (06:49 -0800)]
CI: move macOS dependency installation out of line

Makes these a little easier to manage. Note that this also unifies the runtime
dependencies installed in Autotools and CMake jobs which simplifies ongoing
maintenance.

2 years agoCI: rearrange macOS step related to Bison
Matthew Fernandez [Fri, 11 Mar 2022 05:24:46 +0000 (21:24 -0800)]
CI: rearrange macOS step related to Bison

It makes it more obvious why this step is being done when it is adjacent to the
Bison install itself.

2 years agoCI: install 'libann-dev' on Ubuntu
Matthew Fernandez [Fri, 11 Mar 2022 02:56:03 +0000 (18:56 -0800)]
CI: install 'libann-dev' on Ubuntu

This is a dependency of lib/mingle, and transitively cmd/mingle.

2 years agotests: move 'is_cmake' helper into gvtest library
Matthew Fernandez [Fri, 11 Mar 2022 05:20:18 +0000 (21:20 -0800)]
tests: move 'is_cmake' helper into gvtest library

2 years agotests: de-dupe some MinGW detection logic
Matthew Fernandez [Fri, 11 Mar 2022 04:48:10 +0000 (20:48 -0800)]
tests: de-dupe some MinGW detection logic

2 years agotests: move 'is_mingw' helper into gvtest library
Matthew Fernandez [Fri, 11 Mar 2022 04:47:12 +0000 (20:47 -0800)]
tests: move 'is_mingw' helper into gvtest library

2 years agolib/mingle: remove commented out branch
Matthew Fernandez [Sat, 12 Mar 2022 04:16:39 +0000 (20:16 -0800)]
lib/mingle: remove commented out branch

This causes -Wconstant-logical-operand warnings, failing a CMake build on macOS.
It seems simplest to just remove this disabled code.

2 years agolib/mingle: squash -Wconstant-logical-operand warnings
Matthew Fernandez [Sat, 12 Mar 2022 02:44:37 +0000 (18:44 -0800)]
lib/mingle: squash -Wconstant-logical-operand warnings

When enabling this code on macOS, Clang complains about this.

2 years agofix: teach mingle '-?' on macOS and Windows
Matthew Fernandez [Fri, 11 Mar 2022 03:59:09 +0000 (19:59 -0800)]
fix: teach mingle '-?' on macOS and Windows

This is the equivalent of b4925c87f1e28a1bc66d111ef046e4e083db8c5b and friends,
but for mingle. It was not previously detected that this problem also affects
mingle because it is not currently built on macOS or Windows in CI. This will be
improved in future.

Gitlab: #1852

2 years agoMerge branch 'smattr/5A4AA4D3-3163-49C0-9DF1-A0ADA71E3554' into 'main'
Matthew Fernandez [Sat, 19 Mar 2022 18:40:02 +0000 (18:40 +0000)]
Merge branch 'smattr/5A4AA4D3-3163-49C0-9DF1-A0ADA71E3554' into 'main'

Revert "rewrite indexOf"

Closes #2211

See merge request graphviz/graphviz!2513

2 years agoRevert "rewrite indexOf"
Matthew Fernandez [Mon, 14 Mar 2022 05:27:02 +0000 (22:27 -0700)]
Revert "rewrite indexOf"

This reverts commit 84efe93d5c5a4da0e778dbf01ed8550d2d774fdf.

Gitlab: fixes #2211

2 years agoadd a test case for #2211
Matthew Fernandez [Mon, 14 Mar 2022 02:23:28 +0000 (19:23 -0700)]
add a test case for #2211

2 years agotests: abstract the common case for running 'gvpr'
Matthew Fernandez [Mon, 14 Mar 2022 02:20:55 +0000 (19:20 -0700)]
tests: abstract the common case for running 'gvpr'

2 years agoMerge branch 'smattr/106DE02D-AD56-466A-96C1-9D2AC5315DD6' into 'main'
Matthew Fernandez [Sat, 19 Mar 2022 06:46:15 +0000 (06:46 +0000)]
Merge branch 'smattr/106DE02D-AD56-466A-96C1-9D2AC5315DD6' into 'main'

lib/common: some clean up and warning squashing

See merge request graphviz/graphviz!2511

2 years agoprocessTbl: use unsigned shorts for 'r' and 'c' locals
Matthew Fernandez [Sun, 13 Mar 2022 21:10:19 +0000 (14:10 -0700)]
processTbl: use unsigned shorts for 'r' and 'c' locals

Squashes two MSVC conversion warnings.

2 years agosize_html_txt: use a C99 bool for 'simple'
Matthew Fernandez [Sun, 13 Mar 2022 21:07:21 +0000 (14:07 -0700)]
size_html_txt: use a C99 bool for 'simple'

Squashes an MSVC conversion warning.

2 years agoinitAnchor: squash C4244 MSVC warning for 'explicit_tooltip'
Matthew Fernandez [Sun, 13 Mar 2022 21:05:35 +0000 (14:05 -0700)]
initAnchor: squash C4244 MSVC warning for 'explicit_tooltip'

MSVC seems particularly pedantic about implicitly converting an unsigned 1-bit
bitfield to a bool:

  warning C4244: 'function': conversion from 'unsigned int' to 'bool'

These bitfields should really be signed (`int`) but it does not seem worth the
API break to do this.

2 years agohtmlparse.y: remove some unnecessary casts
Matthew Fernandez [Sun, 13 Mar 2022 21:02:11 +0000 (14:02 -0700)]
htmlparse.y: remove some unnecessary casts

2 years agohtmlparse.y: consistently treat 'kind' as a 'char'
Matthew Fernandez [Sun, 13 Mar 2022 20:59:50 +0000 (13:59 -0700)]
htmlparse.y: consistently treat 'kind' as a 'char'

The `kind` field in `htmllabel_t` is a `char`, so this code was causing
conversion compiler warnings when trying to assign an `int` to it. We can avoid
this ambiguity by consistently using the same type everywhere.

2 years agoemit_end_edge: squash C4244 MSVC warnings for 'nodeIntersect' calls
Matthew Fernandez [Sun, 13 Mar 2022 20:50:43 +0000 (13:50 -0700)]
emit_end_edge: squash C4244 MSVC warnings for 'nodeIntersect' calls

MSVC seems particularly pedantic about implicitly converting an unsigned 1-bit
bitfield to a bool:

  warning C4244: 'function': conversion from 'unsigned int' to 'bool'

These bitfields should really be signed (`int`) but it does not seem worth the
API break to do this.

2 years agocheck_control_points: remove a use of int as boolean
Matthew Fernandez [Sun, 13 Mar 2022 20:36:30 +0000 (13:36 -0700)]
check_control_points: remove a use of int as boolean

2 years agoMerge branch 'smattr/4C161FEF-32BC-4E3C-8E1C-1976BC9E6E9C' into 'main'
Matthew Fernandez [Sat, 19 Mar 2022 05:07:14 +0000 (05:07 +0000)]
Merge branch 'smattr/4C161FEF-32BC-4E3C-8E1C-1976BC9E6E9C' into 'main'

pathcanon: clean up dead code

See merge request graphviz/graphviz!2512

2 years agopathcanon: remove 'FS_3D'-guarded code
Matthew Fernandez [Mon, 14 Mar 2022 00:38:59 +0000 (17:38 -0700)]
pathcanon: remove 'FS_3D'-guarded code

Nothing in the build systems defines this macro. It is also unclear how this
code could be used given it calls `pathnext`, a function that has never been
committted to the Graphviz repository.

2 years agoremove now-unused 'pathgetlink'
Matthew Fernandez [Mon, 14 Mar 2022 00:36:55 +0000 (17:36 -0700)]
remove now-unused 'pathgetlink'

2 years agopathcanon: remove 'flags' argument
Matthew Fernandez [Mon, 14 Mar 2022 00:34:07 +0000 (17:34 -0700)]
pathcanon: remove 'flags' argument

This function was only ever called with `0` as `flags`, which disables a lot of
its logic. We can reduce the amount of ongoing code to maintain by paring this
back to just the core in use.

2 years agoMerge branch 'remove-eol-spaces' into 'main'
Matthew Fernandez [Fri, 18 Mar 2022 16:10:30 +0000 (16:10 +0000)]
Merge branch 'remove-eol-spaces' into 'main'

2184.dot: remove eol spaces

See merge request graphviz/graphviz!2516