]>
granicus.if.org Git - graphviz/log
Magnus Jacobsson [Sun, 15 Nov 2020 15:27:11 +0000 (16:27 +0100)]
Add copy of dot to circo, fdp, neato, osage, patchwork, sfdp & twopi for MSBuild builds
Magnus Jacobsson [Sun, 15 Nov 2020 16:03:40 +0000 (17:03 +0100)]
Remove surplus / character in path to dot on Windows
The delimiter is \ on Windows and it is already included in
$(OutDir);
Magnus Jacobsson [Sun, 15 Nov 2020 15:15:13 +0000 (16:15 +0100)]
Remove gv2gml from tools_not_built_with_cmake
Magnus Jacobsson [Sun, 15 Nov 2020 15:14:41 +0000 (16:14 +0100)]
Remove circo, fdp, neato, osage, patchwork, sfdp & twopi from tools_not_built_with_cmake
Bob Apthorpe [Tue, 21 Jul 2020 22:44:35 +0000 (17:44 -0500)]
Added gv2gml symlink/copy to gml2gv
Bob Apthorpe [Tue, 21 Jul 2020 17:54:20 +0000 (12:54 -0500)]
Installs dot copies (WIN32) and symlinks
Magnus Jacobsson [Sun, 29 Nov 2020 17:32:05 +0000 (17:32 +0000)]
Merge branch 'fix-1875-and-enable-all-warnings-for-non-msvc-cmake-builds' into 'master'
Fix 1875 and enable all warnings for non MSVC CMake builds
Closes #1875
See merge request graphviz/graphviz!1679
Magnus Jacobsson [Sat, 31 Oct 2020 08:23:50 +0000 (09:23 +0100)]
Enable all warnings for non-MSVC CMake builds
Magnus Jacobsson [Sat, 7 Nov 2020 14:13:04 +0000 (15:13 +0100)]
Fix missing return NULL and remove 1 -Wunused-but-set-variable warning in mmio.c
Fixes https://gitlab.com/graphviz/graphviz/-/issues/1875 although this
problem does not currently manifest itself since the
mm_typecode_to_str function is only used in functions writing Matrix
Market files which none of the Graphviz tools currently does.
Magnus Jacobsson [Sun, 29 Nov 2020 15:44:19 +0000 (15:44 +0000)]
Merge branch 'remove-warnings-and-fix-minor-issues' into 'master'
Remove warnings and fix minor issues
Closes #1869
See merge request graphviz/graphviz!1678
Magnus Jacobsson [Mon, 9 Nov 2020 19:12:46 +0000 (20:12 +0100)]
Correct spelling in comment
Magnus Jacobsson [Sun, 8 Nov 2020 10:14:47 +0000 (11:14 +0100)]
Remove1 -Wuninitialized warning in postproc.c
The 'pos' value is ignored in the addXLabel function since 'initObj'
is 0.
Magnus Jacobsson [Mon, 9 Nov 2020 17:28:53 +0000 (18:28 +0100)]
Add regression test case for gml2gv
Related to #1869.
Magnus Jacobsson [Sun, 8 Nov 2020 10:02:56 +0000 (11:02 +0100)]
Correct width definition in GML parser
It's unclear if this caused any problem.
Magnus Jacobsson [Sun, 8 Nov 2020 10:01:40 +0000 (11:01 +0100)]
Fix gml2gv style and width parsing
Fixes https://gitlab.com/graphviz/graphviz/-/issues/1869.
Also removes 2 -Wtautological-overlap-compare warnings.
Magnus Jacobsson [Sun, 8 Nov 2020 08:38:13 +0000 (09:38 +0100)]
Remove 1 -Wsometimes-uninitialized warning in ortho.c
Magnus Jacobsson [Sun, 8 Nov 2020 08:23:20 +0000 (09:23 +0100)]
Remove 1 -Wself-assign warning in edge_bundling.c
Magnus Jacobsson [Sat, 7 Nov 2020 15:15:14 +0000 (16:15 +0100)]
Remove 1 -Wunused-function warning in nearest_neighbor_graph_ann.cpp
Magnus Jacobsson [Sat, 7 Nov 2020 15:11:57 +0000 (16:11 +0100)]
Remove 1 -Wmaybe-uninitialized warning in ink.c
Most certainly the unitialized values were not intended to used by the
callers since the return value of the function in this case is set to
a "large" value to indicate failure and the callers have assertions
that seems to guard from using such values by mistake (although a
thorough understanding of the algorithm and minimum ink values are
needed to prove this).
Altough the original author seems to have intended to set them to the
mid point, perhaps as a precautionary measure, the assigment has been
removed and new assertions has been added to the relevant call sites
to garantee that they are never used.
Magnus Jacobsson [Sat, 7 Nov 2020 14:57:07 +0000 (15:57 +0100)]
Correct assertion and remove 1 -Wparentheses warning in agglomerative_bundling.c
Magnus Jacobsson [Sat, 7 Nov 2020 14:30:36 +0000 (15:30 +0100)]
Remove 1 -Wunused-function warning in gmlscan.l
Magnus Jacobsson [Sat, 7 Nov 2020 14:26:14 +0000 (15:26 +0100)]
Remove 1 -Wunused-function warning in scan.l
Magnus Jacobsson [Sat, 7 Nov 2020 14:19:23 +0000 (15:19 +0100)]
Remove 2 -Wunused-but-set-variable warnings in graph_generator.c
Magnus Jacobsson [Sat, 7 Nov 2020 14:12:02 +0000 (15:12 +0100)]
Remove 2 -Wunused-function warning in gvrender_gd.c
Magnus Jacobsson [Sat, 7 Nov 2020 14:01:44 +0000 (15:01 +0100)]
Remove 2 -Wunused-variable warnings in gvrender_gd.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:59:00 +0000 (14:59 +0100)]
Remove 2 -Wunused-but-set-variable warnings in gvrender_gd.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:57:09 +0000 (14:57 +0100)]
Remove 2 -Wunused-but-set-variable warnings in gvrender_core_vml.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:56:14 +0000 (14:56 +0100)]
Remove 3 -Wunused-but-set-variable warnings in gvrender_core_pic.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:55:02 +0000 (14:55 +0100)]
Remove some commented out code in gvrender_core_pic.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:52:05 +0000 (14:52 +0100)]
Remove 1 -Wunused-but-set-variable warning in gvrender_core_json.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:51:09 +0000 (14:51 +0100)]
Remove 1 -Wunused-but-set-variable warning in gvdevice.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:32:55 +0000 (14:32 +0100)]
Remove 1 -Wunused-but-set-variable warning in node.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:32:16 +0000 (14:32 +0100)]
Remove 1 -Wunused-but-set-variable warning in edge.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:30:19 +0000 (14:30 +0100)]
Remove 1 -Wunused-but-set-variable warning in twopiinit.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:29:21 +0000 (14:29 +0100)]
Remove 3 -Wunused-but-set-variable warnings in post_process.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:25:12 +0000 (14:25 +0100)]
Remove 6 -Wunused-but-set-variable warnings in Multilevel.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:15:31 +0000 (14:15 +0100)]
Remove 2 -Wunused-but-set-variable warnings in SparseMatrix.c
Magnus Jacobsson [Sat, 7 Nov 2020 13:14:04 +0000 (14:14 +0100)]
Remove 2 -Wunused-but-set-variable warnings in DotIO.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:57:56 +0000 (13:57 +0100)]
Correct assertion and remove 1 -Wparentheses warning in BinaryHeap.c
Note the operator is changed from assigment to *inequality*. From the
surrounding code it's apparent that the intent was to check that no -1
values are left in the mask array (equality to 1 would also have been
correct).
Magnus Jacobsson [Sat, 7 Nov 2020 12:52:59 +0000 (13:52 +0100)]
Remove 1 -Wunused-but-set-variable warning in partition.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:51:51 +0000 (13:51 +0100)]
Remove 2 -Wunused-but-set-variable warnings in ortho.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:51:07 +0000 (13:51 +0100)]
Remove 1 -Wunused-but-set-variable warning in maze.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:50:25 +0000 (13:50 +0100)]
Remove 1 -Wunused-but-set-variable warning in neatosplines.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:50:00 +0000 (13:50 +0100)]
Remove 1 -Wunused-but-set-variable warning in compute_hierarchy.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:42:44 +0000 (13:42 +0100)]
Remove 2 -Wunused-but-set-variable warnings in dotsplines.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:40:49 +0000 (13:40 +0100)]
Remove 1 -Wunused-but-set-variable warning in aspect.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:39:54 +0000 (13:39 +0100)]
Fix handling of epsf file read error in psusershape.c
Also removes 1 -Wunused-but-set-variable warning
Magnus Jacobsson [Sat, 7 Nov 2020 12:39:09 +0000 (13:39 +0100)]
Remove 4 -Wunused-function warnings in ns.c
Magnus Jacobsson [Sat, 7 Nov 2020 12:37:41 +0000 (13:37 +0100)]
Remove 1 -Wunused-but-set-variable warning in dtview.c
Matthew Fernandez [Sun, 15 Nov 2020 01:09:06 +0000 (01:09 +0000)]
Merge branch 'smattr/
614456fd -ae2a-4243-93d1-
e2fa5ee18cc0 ' into 'master'
fix concentrate=true segfaults
Closes #1771 and #167
See merge request graphviz/graphviz!1664
Matthew Fernandez [Sun, 8 Nov 2020 23:03:57 +0000 (15:03 -0800)]
remove comparison against boolean literals in conc.c
Matthew Fernandez [Sun, 8 Nov 2020 23:02:55 +0000 (15:02 -0800)]
remove unnecessary bracketing in conc.c
Matthew Fernandez [Sun, 8 Nov 2020 22:56:27 +0000 (14:56 -0800)]
fix: anticipate no non-normal edges when computing direction with concentrate
With concentrate enabled (`concentrate=true`), the direction of edges is
analyzed in lib/dotgen/conc.c. The loops in `samedir()` did not anticipate that
they may not find a single non-normal edge before hitting the end of an edge
chain. This change removes this assumption.
Fixes #167, #1771.
Matthew Fernandez [Sat, 14 Nov 2020 03:02:25 +0000 (03:02 +0000)]
Merge branch 'smattr/
c15b6722 -05d6-4d5f-9e5f-
34bc637d7ad9 ' into 'master'
minor modernization in libvpsc
See merge request graphviz/graphviz!1662
Matthew Fernandez [Sat, 7 Nov 2020 21:27:58 +0000 (13:27 -0800)]
remove use of std::endl in VPSC
Use of std::endl is generally considered an anti-pattern these days.
Matthew Fernandez [Sat, 7 Nov 2020 21:18:21 +0000 (13:18 -0800)]
make VPSC debugging code visible to the compiler
The compiler can still optimize this out, but this way we ensure it always stays
compilable and consistent with the surrounding code.
Matthew Fernandez [Sat, 7 Nov 2020 20:45:40 +0000 (12:45 -0800)]
remove unnecessary ifdef guards
Matthew Fernandez [Sat, 14 Nov 2020 02:32:47 +0000 (02:32 +0000)]
Merge branch 'smattr/
174FAE10 -334A-4463-A0AD-
FE61C51E45D8 ' into 'master'
add a section of performance and profiling to dev docs
See merge request graphviz/graphviz!1661
Matthew Fernandez [Sat, 14 Nov 2020 02:20:11 +0000 (02:20 +0000)]
Merge branch 'smattr/
134762F6 -3732-49B2-A65D-
FACE0D5BDAB6 ' into 'master'
removal of another setjmp/longjmp
See merge request graphviz/graphviz!1660
Matthew Fernandez [Sat, 7 Nov 2020 16:43:24 +0000 (08:43 -0800)]
remove some unnecessary bracketing
Matthew Fernandez [Sat, 7 Nov 2020 16:37:45 +0000 (08:37 -0800)]
replace a malloc array allocation with calloc
This can be more efficient for large allocations and is generally cleaner code.
Matthew Fernandez [Sat, 7 Nov 2020 16:36:07 +0000 (08:36 -0800)]
remove some unnecessary casts of malloc return values
Some cases that were missed in
e33fdf6d35f379bf53dc9656d07efba46077a617 .
Matthew Fernandez [Sat, 7 Nov 2020 16:32:22 +0000 (08:32 -0800)]
remove a use of longjmp and use explicit return instead
Related to #1801.
Matthew Fernandez [Thu, 12 Nov 2020 15:25:28 +0000 (15:25 +0000)]
Merge branch 'smattr/
ea4ee7c7 -8a0e-4f9f-bfdf-
37e082768793 ' into 'master'
remove commented out code in Smyrna
See merge request graphviz/graphviz!1659
Matthew Fernandez [Sat, 7 Nov 2020 22:20:27 +0000 (14:20 -0800)]
add a section of performance and profiling to dev docs
Matthew Fernandez [Sat, 7 Nov 2020 16:06:56 +0000 (08:06 -0800)]
remove unused xdotstate, xdotstyle
Matthew Fernandez [Fri, 6 Nov 2020 04:12:26 +0000 (20:12 -0800)]
remove commented out code in Smyrna
Matthew Fernandez [Sat, 7 Nov 2020 04:10:31 +0000 (04:10 +0000)]
Merge branch 'smattr/
4AE22380 -A30F-4A49-B284-
320A2BCDEBB2 ' into 'master'
fix buffer under-read in fdp
Closes #1290, #236, and #1865
See merge request graphviz/graphviz!1658
Matthew Fernandez [Sun, 1 Nov 2020 03:17:23 +0000 (20:17 -0700)]
remove some unnecessary brackets
Matthew Fernandez [Sun, 1 Nov 2020 02:41:27 +0000 (19:41 -0700)]
fix buffer under-read in fdp
When using fdp to process a graph, it would try to canonicalize all node names,
regardless of whether they were hosted in refstr_ts or not. The problem with
this is that the canonicalization logic assumes the character pointer passed
into it is within a refstr_t and that therefore it can do pointer subtraction to
get a pointer to the refstr_t itself. This was not true for internally
constructed node names like "%4".
We change this to always go through the refstr logic in agstrdup() when
canonicalizing names. This ensures that the pointer we pass into the
canonicalization logic *is* within a refstr_t. This is based on canon() in
lib/cgraph/output.c. Fixes #236, #1290, #1865.
Matthew Fernandez [Sat, 7 Nov 2020 02:10:12 +0000 (02:10 +0000)]
Merge branch 'smattr/
c43d1d65 -32e9-4049-a95f-
9b209af13c66 ' into 'master'
fix: anticipate empty clusters when using newrank
Closes #1221
See merge request graphviz/graphviz!1657
Matthew Fernandez [Sat, 31 Oct 2020 23:40:07 +0000 (16:40 -0700)]
squash some unused parameter warnings
Matthew Fernandez [Sat, 31 Oct 2020 23:39:56 +0000 (16:39 -0700)]
remove unused sg variable
Matthew Fernandez [Sat, 31 Oct 2020 23:39:43 +0000 (16:39 -0700)]
squash a -Wundef warning
Matthew Fernandez [Sat, 31 Oct 2020 23:39:26 +0000 (16:39 -0700)]
remove an unused parameter to mincross_clust()
Matthew Fernandez [Sat, 31 Oct 2020 23:03:03 +0000 (16:03 -0700)]
remove some unnecessary bracketing
Matthew Fernandez [Sat, 31 Oct 2020 23:01:31 +0000 (16:01 -0700)]
introduce an assertion on rank consistency
Related to #1221.
Matthew Fernandez [Sat, 31 Oct 2020 22:42:05 +0000 (15:42 -0700)]
fix: anticipate empty clusters when using newrank
When using newrank=true and incorrectly putting a node in two clusters, one of
the clusters would end up empty. This broke assumptions in the crossing logic;
e.g. that all clusters have a leader. We fix this by detecting empty clusters
and removing them prior to the crossing logic. Fixes #1221.
Matthew Fernandez [Sat, 7 Nov 2020 01:23:59 +0000 (01:23 +0000)]
Merge branch 'smattr/
119AD784 -5E65-4421-BC9A-
F772B4532C94 ' into 'master'
fix: fclose(NULL) in the VRML plugin when current directory is not writable
Closes #793
See merge request graphviz/graphviz!1656
Matthew Fernandez [Sat, 31 Oct 2020 17:02:43 +0000 (10:02 -0700)]
optimize gvputs() usage in the VRML plugin
Combining these calls reduces the function call related overhead in this logic.
Matthew Fernandez [Sat, 31 Oct 2020 16:38:52 +0000 (09:38 -0700)]
remove an unnecessary unary +
Matthew Fernandez [Sat, 31 Oct 2020 16:28:24 +0000 (09:28 -0700)]
fix: fclose(NULL) in the VRML plugin when current directory is not writable
The VRML plugin writes PNG files of each node in the graph alongside the VRML
output that then references these files. If you give no output location (do not
pass `-o` to dot), the VRML output is written to stdout and the node PNG files
are written to the current directory. However, the plugin was not checking
whether opening of these PNG files succeeded. As a result, if the current
directory was not writable, it would end up calling fclose() with a NULL
pointer.
This change makes the plugin report the failure to open PNG files and cause dot
to eventually exit with non-zero. Note that VRML processing is not stopped, so
the user can still get complete VRML output, albeit missing the associated PNG
files that will be referenced.
The test case included in this commit does not necessarily reproduce the failure
prior to these changes. This is because Glibc allows fclose(NULL). However, this
is beyond the spec and other libcs do not provide these guarantees.
Fixes #793.
Matthew Fernandez [Wed, 4 Nov 2020 16:27:20 +0000 (16:27 +0000)]
Merge branch 'smattr/
8b5fbbeb -e221-4eb3-a26b-
0935708c3521 ' into 'master'
remove unnecessary branching for malloc/realloc
See merge request graphviz/graphviz!1652
Matthew Fernandez [Thu, 29 Oct 2020 02:54:31 +0000 (19:54 -0700)]
remove unnecessary cast of a parameter to realloc()
This implicitly coerces to void*.
Matthew Fernandez [Thu, 29 Oct 2020 02:51:47 +0000 (19:51 -0700)]
remove some unnecessary allocation casts
These return values implicitly coerce to other pointer types.
Matthew Fernandez [Thu, 29 Oct 2020 02:50:49 +0000 (19:50 -0700)]
remove some unnecessary branching for malloc/realloc
When realloc() is passed NULL as its first parameter, it acts the same as
malloc().
Matthew Fernandez [Thu, 29 Oct 2020 02:48:51 +0000 (19:48 -0700)]
remove some commented out code
Matthew Fernandez [Wed, 4 Nov 2020 15:57:52 +0000 (15:57 +0000)]
Merge branch 'smattr/
5d4e3a2b -8dff-4eee-81b1-
76ad3a6885be ' into 'master'
squash some compiler warnings
See merge request graphviz/graphviz!1651
Matthew Fernandez [Thu, 29 Oct 2020 01:19:31 +0000 (18:19 -0700)]
squash a -Wconversion warning
Matthew Fernandez [Thu, 29 Oct 2020 01:19:17 +0000 (18:19 -0700)]
squash a -Wconversion warning
Matthew Fernandez [Thu, 29 Oct 2020 01:18:57 +0000 (18:18 -0700)]
squash some -Wconversion warnings
Matthew Fernandez [Thu, 29 Oct 2020 01:18:31 +0000 (18:18 -0700)]
remove an unnecessary cast
Squashes a -Wcast-qual warning.
Matthew Fernandez [Thu, 29 Oct 2020 01:08:42 +0000 (18:08 -0700)]
remove unused addSpace parameter to gv_trim_zeros()
Matthew Fernandez [Tue, 3 Nov 2020 01:36:44 +0000 (01:36 +0000)]
Merge branch 'smattr/
DF679B9B -496A-45B6-B14B-
856D8DD8212B ' into 'master'
make compiler warnings for CMake Linux/macOS builds fail CI
See merge request graphviz/graphviz!1653
Magnus Jacobsson [Sun, 1 Nov 2020 14:05:47 +0000 (14:05 +0000)]
Merge branch 'with-quartz-yes-on-macos' into 'master'
Enable building with quartz on macOS
See merge request graphviz/graphviz!1649
Magnus Jacobsson [Mon, 26 Oct 2020 07:20:39 +0000 (08:20 +0100)]
Add --with-quartz=yes to configure on macOS
Matthew Fernandez [Sun, 1 Nov 2020 03:20:08 +0000 (03:20 +0000)]
Merge branch 'smattr/
4EEAF0CE -D0C3-479C-A9F1-
A91B90168C2F ' into 'master'
fix some #includes in the Quartz plugin
See merge request graphviz/graphviz!1648
Matthew Fernandez [Sun, 25 Oct 2020 20:50:46 +0000 (13:50 -0700)]
fix some #includes in the Quartz plugin
This reverts part of
d80f685dbacc2cfa3e496415739b4d6cfad32233 that incorrectly
updated paths to the header gvplugin_quartz.h. This mistake was not detected at
the time as we did not have macOS CI. Thanks to Stephen for picking this up.
Related to #1785.
Matthew Fernandez [Sat, 31 Oct 2020 03:20:41 +0000 (20:20 -0700)]
make compiler warnings for CMake Linux/macOS builds fail CI
Now that these builds are warning-free, we can "turn the ratchet" to demand they
stay warning-free or constitute a regression.
Matthew Fernandez [Sat, 31 Oct 2020 02:40:03 +0000 (02:40 +0000)]
Merge branch 'smattr/
9f1ba4b1 -6f37-4d49-b1a2-
3f1fee7ee743 ' into 'master'
some pythonizing of rtest
See merge request graphviz/graphviz!1646