]>
granicus.if.org Git - graphviz/log
Matthew Fernandez [Sat, 4 Jun 2022 15:25:11 +0000 (08:25 -0700)]
Revert "common: remove “slimey” comment"
This reverts commit
7e324d56c12d639c4bdeca387790c3588606ea10 .
Matthew Fernandez [Sat, 4 Jun 2022 15:25:01 +0000 (08:25 -0700)]
Revert "common: inline and remove 'printstring'"
This reverts commit
d7beb4590d683879cf8501a90fc70ce094ec5691 .
Matthew Fernandez [Sat, 4 Jun 2022 15:24:53 +0000 (08:24 -0700)]
Revert "common: inline and remove 'printint'"
This reverts commit
4e12bb0867503ceb142227e5b620b476abe77d52 .
Matthew Fernandez [Sat, 4 Jun 2022 15:24:46 +0000 (08:24 -0700)]
Revert "common: inline and remove 'printdouble'"
This reverts commit
eb9c96face472a4f8e6b44834dbe2e5d79d80c53 .
Matthew Fernandez [Sat, 4 Jun 2022 15:24:39 +0000 (08:24 -0700)]
Revert "common: fuse adjacent 'print' calls"
This reverts commit
c34df972f39b01b0b177faf88d548fd5c813b83b .
Matthew Fernandez [Sat, 4 Jun 2022 15:24:29 +0000 (08:24 -0700)]
Revert "common: inline and remove 'agputs'"
This reverts commit
f42fcb6759c1614fc07bae546a9da47c20d389bb .
Matthew Fernandez [Sat, 4 Jun 2022 20:23:55 +0000 (20:23 +0000)]
Merge branch 'smattr/
293EA9CE -1621-4467-B751-
1ECF9AF7195B ' into 'main'
common: squash spurious -Wconversion warnings in 'new_virtual_edge'
See merge request graphviz/graphviz!2706
Matthew Fernandez [Sun, 8 May 2022 19:55:35 +0000 (12:55 -0700)]
common: squash spurious -Wconversion warnings in 'new_virtual_edge'
By doing these assignments all in a single line, the compiler was fooled into
believing there was some unintentional narrowing happening:
fastgr.c: In function 'new_virtual_edge':
../../lib/common/types.h:592:22: warning: conversion from 'int' to 'short int'
may change value [-Wconversion]
592 | #define ED_weight(e) (((Agedgeinfo_t*)AGDATA(e))->weight)
| ^
fastgr.c:192:55: note: in expansion of macro 'ED_weight'
192 | ED_minlen(e) = ED_count(e) = ED_xpenalty(e) = ED_weight(e) = 1
| ^~~~~~~~~
../../lib/common/types.h:569:21: warning: conversion to 'short unsigned int'
from 'short int' may change the sign of the result [-Wsign-conversion]
569 | #define ED_count(e) (((Agedgeinfo_t*)AGDATA(e))->count)
| ^
fastgr.c:192:24: note: in expansion of macro 'ED_count'
192 | ED_minlen(e) = ED_count(e) = ED_xpenalty(e) = ED_weight(e) = 1
| ^~~~~~~~
We can make it clearer and avoid these warnings by separating the assignments.
Matthew Fernandez [Sat, 4 Jun 2022 17:18:20 +0000 (17:18 +0000)]
Merge branch 'smattr/
9C9FEE40 -4CE7-4250-A1BC-
BE5185A4AC44 ' into 'main'
smyrna warning squashing
See merge request graphviz/graphviz!2699
Matthew Fernandez [Fri, 6 May 2022 00:54:45 +0000 (17:54 -0700)]
smyrna: squash some -Wfloat-conversion warnings
Matthew Fernandez [Fri, 6 May 2022 00:52:06 +0000 (17:52 -0700)]
smyrna: mark 'copy_attr' static
This function is not used outside of its containing file.
Matthew Fernandez [Fri, 6 May 2022 00:50:43 +0000 (17:50 -0700)]
smyrna: remove unused return value of 'cb_game_mode'
Matthew Fernandez [Fri, 6 May 2022 00:48:53 +0000 (17:48 -0700)]
smyrna: propagate and remove 'fullscreen' parameter to 'cb_glutinit'
This function did not properly support non-fullscreen mode, as evidenced by the
`x` and `y` parameters (removed in the previous commit) that it was ignoring.
Matthew Fernandez [Fri, 6 May 2022 00:46:30 +0000 (17:46 -0700)]
smyrna: remove unused parameter to 'cb_glutinit'
Matthew Fernandez [Fri, 6 May 2022 00:42:13 +0000 (17:42 -0700)]
smyrna: squash -Wunused-parameter warnings for GLUT callbacks
These functions need to conform to a particular type signature.
Matthew Fernandez [Sat, 4 Jun 2022 16:16:58 +0000 (16:16 +0000)]
Merge branch 'smattr/
1175FE55 -FCE5-4173-B59E-
6C30DFBE6AF1 ' into 'main'
sparse: remove 'transpose' parameter from 'SparseMatrix_multiply_vector'
See merge request graphviz/graphviz!2703
Matthew Fernandez [Fri, 27 May 2022 01:38:19 +0000 (18:38 -0700)]
sparse: remove 'transpose' parameter from 'SparseMatrix_multiply_vector'
This function is only used to multiply untransposed matrices.
Matthew Fernandez [Sat, 4 Jun 2022 06:06:28 +0000 (06:06 +0000)]
Merge branch 'smattr/
ED48F907 -F75B-4B57-B10D-
B9C95033FDAB ' into 'main'
bcomps: replace unchecked allocations with alloc helpers
See merge request graphviz/graphviz!2709
Matthew Fernandez [Sat, 28 May 2022 19:26:52 +0000 (12:26 -0700)]
bcomps: replace unchecked allocations with alloc helpers
This addresses some instances where out-of-memory would go undetected, leading
to a crash and/or data corruption.
Matthew Fernandez [Sat, 4 Jun 2022 04:37:39 +0000 (04:37 +0000)]
Merge branch 'smattr/
2095BD9E -3E7D-4BD9-BC12-
1B5EA3B75D3D ' into 'main'
dotgen: squash -Wsign-conversion warnings in 'medians'
See merge request graphviz/graphviz!2698
Matthew Fernandez [Sun, 8 May 2022 23:41:17 +0000 (16:41 -0700)]
dotgen: squash -Wsign-conversion warnings in 'medians'
The compiler says:
mincross.c: In function 'medians':
mincross.c:1803:25: warning: conversion to 'size_t' {aka 'long unsigned int'}
from 'int' may change the sign of the result [-Wsign-conversion]
1803 | qsort(list, j, sizeof(int), (qsort_cmpf) ordercmpf);
| ^
By doing array indexing in this function universally as `size_t` we can avoid
this.
Matthew Fernandez [Sat, 4 Jun 2022 03:32:23 +0000 (03:32 +0000)]
Merge branch 'smattr/
51D1DF21 -4D0E-4E0F-9E2A-
3E9F3CA0D5C4 ' into 'main'
sparse: remove support for three-way multiplication of non-real matrices
See merge request graphviz/graphviz!2704
Matthew Fernandez [Fri, 27 May 2022 14:31:21 +0000 (07:31 -0700)]
sparse: remove support for three-way multiplication of non-real matrices
The function `SparseMatrix_multiply3` is only used to multiple real matrices.
Magnus Jacobsson [Sun, 29 May 2022 10:49:11 +0000 (10:49 +0000)]
Merge branch 'start-4.0.1-dev' into 'main'
Start 4.0.1 development
See merge request graphviz/graphviz!2710
Magnus Jacobsson [Sun, 29 May 2022 08:51:15 +0000 (10:51 +0200)]
Start 4.0.1 development
Magnus Jacobsson [Sun, 29 May 2022 09:37:45 +0000 (09:37 +0000)]
Merge branch 'stable-release-4.0.0' into 'main'
Stable Release 4.0.0
See merge request graphviz/graphviz!2694
Magnus Jacobsson [Tue, 24 May 2022 07:21:05 +0000 (09:21 +0200)]
Stable Release 4.0.0
Matthew Fernandez [Sat, 28 May 2022 22:31:04 +0000 (22:31 +0000)]
Merge branch 'smattr/
BCE20F0D -9459-499B-A828-
5DD50E5827A3 ' into 'main'
sparse: remove some dead code paths
See merge request graphviz/graphviz!2697
Matthew Fernandez [Tue, 24 May 2022 04:37:40 +0000 (21:37 -0700)]
sparse: remove 'weight' from 'QuadTree_new_from_point_list'
This parameter is always passed as `NULL`.
Matthew Fernandez [Tue, 24 May 2022 03:19:32 +0000 (20:19 -0700)]
sfdpgen: remove unused 'node_weights' from 'spring_maxent_embedding'
Matthew Fernandez [Tue, 24 May 2022 03:18:02 +0000 (20:18 -0700)]
sfdpgen: remove unused 'node_weights' from 'spring_electrical_embedding'
Matthew Fernandez [Tue, 24 May 2022 03:14:48 +0000 (20:14 -0700)]
sfdpgen: remove unused 'node_weights' from 'spring_electrical_embedding_slow'
Matthew Fernandez [Tue, 24 May 2022 03:13:03 +0000 (20:13 -0700)]
sfdpgen: remove unused 'node_weights' from 'spring_electrical_embedding_fast'
Matthew Fernandez [Tue, 24 May 2022 03:10:00 +0000 (20:10 -0700)]
sfdpgen: remove always-false 'use_node_weights'
Matthew Fernandez [Tue, 24 May 2022 02:53:01 +0000 (19:53 -0700)]
sfdpgen: remove 'node_weights' from 'spring_electrical_spring_embedding'
This parameter is always passed as `NULL`.
Matthew Fernandez [Tue, 24 May 2022 02:48:34 +0000 (19:48 -0700)]
sfdpgen: remove 'node_weights' from 'SpringSmoother_smooth'
This parameter is always passed as `NULL`.
Matthew Fernandez [Tue, 24 May 2022 02:46:34 +0000 (19:46 -0700)]
sfdpgen: remove 'node_weights' from 'post_process_smoothing'
This parameter is always passed as `NULL`.
Matthew Fernandez [Tue, 24 May 2022 02:44:34 +0000 (19:44 -0700)]
sfdpgen: remove 'node_weights' from 'Multilevel_new'
This parameter is always passed as `NULL`.
Matthew Fernandez [Tue, 24 May 2022 02:39:44 +0000 (19:39 -0700)]
sparse: remove 'node_weights' from 'multilevel_spring_electrical_embedding'
This parameter is always passed as `NULL`.
Matthew Fernandez [Fri, 27 May 2022 15:01:00 +0000 (15:01 +0000)]
Merge branch 'trapezoidation' into 'main'
comment about theory and 📜 origins of trapezoids for ortho
See merge request graphviz/graphviz!2696
Costa Shulyupin [Tue, 24 May 2022 19:29:26 +0000 (22:29 +0300)]
comment about theory and origins of trap.h
Costa Shulyupin [Tue, 24 May 2022 19:16:39 +0000 (22:16 +0300)]
comment about theory and origins of trapezoid.c
Matthew Fernandez [Fri, 27 May 2022 05:54:22 +0000 (05:54 +0000)]
Merge branch 'smattr/
C8308E84 -5819-47FC-B5A1-
2C8A9A0D4BB5 ' into 'main'
dotgen: remove shadowing of 'n' in 'build_ranks'
See merge request graphviz/graphviz!2687
Matthew Fernandez [Sun, 8 May 2022 20:47:20 +0000 (13:47 -0700)]
dotgen: remove shadowing of 'n' in 'build_ranks'
The compiler was warning:
mincross.c:1404:17: warning: declaration of 'n' shadows a previous local
[-Wshadow]
1404 | int n, ndiv2;
| ^
mincross.c:1359:13: note: shadowed declaration is here
1359 | node_t *n, *n0;
| ^
We can trivially rephrase the code to avoid this noise.
Matthew Fernandez [Fri, 27 May 2022 03:16:47 +0000 (03:16 +0000)]
Merge branch 'smattr/
1CFC93CE -61B4-4BC3-AFD5-
CE4AD8428B92 ' into 'main'
upgrade Pylint
See merge request graphviz/graphviz!2677
Matthew Fernandez [Fri, 20 May 2022 00:45:06 +0000 (17:45 -0700)]
upgrade Pylint
Matthew Fernandez [Fri, 27 May 2022 02:02:07 +0000 (02:02 +0000)]
Merge branch 'smattr/
2B028903 -89AB-434A-9AC9-
F7D4D737A1BF ' into 'main'
sparse: simplify 'SparseMatrix_coordinate_form_add_entries'
See merge request graphviz/graphviz!2691
Matthew Fernandez [Mon, 23 May 2022 00:57:50 +0000 (17:57 -0700)]
sparse: remove incorrect comment in 'SparseMatrix_delete'
This appears to have been accidentally copy-pasted from
`SparseMatrix_general_new`.
Matthew Fernandez [Mon, 23 May 2022 00:54:34 +0000 (17:54 -0700)]
sparse: take 'jcn' as a value instead of pointer
Matthew Fernandez [Mon, 23 May 2022 00:48:41 +0000 (17:48 -0700)]
sparse: take 'irn' as a value instead of pointer
Matthew Fernandez [Mon, 23 May 2022 00:40:36 +0000 (17:40 -0700)]
sparse: rename 'SparseMatrix_coordinate_form_add_entries'
Now that this function only adds a single entry, its name should more accurately
indicate this.
Matthew Fernandez [Mon, 23 May 2022 00:03:22 +0000 (17:03 -0700)]
sparse: rewrite 'memcpy' steps in 'SparseMatrix_coordinate_form_add_entries'
Now that we know these steps are always copying a single element, we can write
them simpler.
Matthew Fernandez [Sun, 22 May 2022 23:58:57 +0000 (16:58 -0700)]
sparse: remove 'nentries' from 'SparseMatrix_coordinate_form_add_entries'
This parameter is always passed as 1.
Matthew Fernandez [Fri, 27 May 2022 00:58:42 +0000 (00:58 +0000)]
Merge branch 'doc-cmd' into 'main'
populate directory cmd with doxygen comments
See merge request graphviz/graphviz!2653
Costa Shulyupin [Thu, 5 May 2022 15:42:50 +0000 (18:42 +0300)]
doxygen comments for cmd/smyrna
Costa Shulyupin [Thu, 5 May 2022 15:42:17 +0000 (18:42 +0300)]
doxygen comments for cmd/mingle
Costa Shulyupin [Thu, 5 May 2022 15:41:41 +0000 (18:41 +0300)]
doxygen comments for cmd, lefty, gvmap, lneato, dotty
Costa Shulyupin [Thu, 5 May 2022 15:40:10 +0000 (18:40 +0300)]
doxygen comments for cmd/gvmap
Costa Shulyupin [Thu, 5 May 2022 15:38:46 +0000 (18:38 +0300)]
doxygen comments for cmd/gvedit
Costa Shulyupin [Thu, 5 May 2022 15:37:33 +0000 (18:37 +0300)]
doxygen comments for cmd/edgepaint
symbol % prevents automatic link generation
Reference https://www.doxygen.nl/manual/autolink.html#linkclass
Costa Shulyupin [Thu, 5 May 2022 15:31:24 +0000 (18:31 +0300)]
doxygen comments for cmd/dot
Matthew Fernandez [Thu, 26 May 2022 16:43:23 +0000 (16:43 +0000)]
Merge branch 'smattr/
E952DFA7 -B513-45DE-B06B-
55EDD4629175 ' into 'main'
edgepaint: remove 'iter_max' parameter from 'node_distinct_coloring'
See merge request graphviz/graphviz!2690
Matthew Fernandez [Sun, 22 May 2022 17:08:54 +0000 (10:08 -0700)]
edgepaint: remove 'iter_max' parameter from 'node_distinct_coloring'
This is always set to 100.
Matthew Fernandez [Thu, 26 May 2022 06:22:01 +0000 (06:22 +0000)]
Merge branch 'smattr/
46AE87AD -E20D-448B-A034-
75D02874EF1D ' into 'main'
sparse: remove 'D' parameter from 'SparseMatrix_import_dot' that is always null
See merge request graphviz/graphviz!2673
Matthew Fernandez [Wed, 18 May 2022 15:19:48 +0000 (08:19 -0700)]
sparse: remove 'D' parameter from 'SparseMatrix_import_dot' that is always null
Matthew Fernandez [Thu, 26 May 2022 05:03:22 +0000 (05:03 +0000)]
Merge branch 'smattr/
11C3F22D -F3BE-483F-B2FF-
968986B76565 ' into 'main'
tred: replace a 'malloc' with cgraph alloc wrapper
See merge request graphviz/graphviz!2674
Matthew Fernandez [Tue, 17 May 2022 14:25:44 +0000 (07:25 -0700)]
tred: replace a 'malloc' with cgraph alloc wrapper
This addresses a case where allocation failure went unchecked.
Matthew Fernandez [Thu, 26 May 2022 04:01:41 +0000 (04:01 +0000)]
Merge branch 'doc-tools' into 'main'
populate directory cmd/tools with doxygen comments
See merge request graphviz/graphviz!2657
Costa Shulyupin [Fri, 6 May 2022 07:03:32 +0000 (10:03 +0300)]
doxygen comment for unflatten.c
Costa Shulyupin [Fri, 6 May 2022 07:03:20 +0000 (10:03 +0300)]
doxygen comment for tred.c
Costa Shulyupin [Fri, 6 May 2022 07:03:07 +0000 (10:03 +0300)]
doxygen comment for sccmap.c
Costa Shulyupin [Fri, 6 May 2022 07:02:43 +0000 (10:02 +0300)]
doxygen comment for nop.c
Costa Shulyupin [Fri, 6 May 2022 07:02:30 +0000 (10:02 +0300)]
doxygen comment for mmio.h
Costa Shulyupin [Fri, 6 May 2022 07:02:16 +0000 (10:02 +0300)]
doxygen comment for mm2gv.c
Costa Shulyupin [Fri, 6 May 2022 07:02:03 +0000 (10:02 +0300)]
doxygen comment for matrix_market.h
Costa Shulyupin [Fri, 6 May 2022 07:01:50 +0000 (10:01 +0300)]
doxygen comment for gxl2gv.c
Costa Shulyupin [Fri, 6 May 2022 07:01:38 +0000 (10:01 +0300)]
doxygen comment for gvpack.cpp
Costa Shulyupin [Fri, 6 May 2022 07:01:22 +0000 (10:01 +0300)]
doxygen comment for gvgen.c
Costa Shulyupin [Fri, 6 May 2022 07:01:02 +0000 (10:01 +0300)]
doxygen comment for gvcolor.c
Costa Shulyupin [Fri, 6 May 2022 07:00:50 +0000 (10:00 +0300)]
doxygen comment for gv2gxl.c
Costa Shulyupin [Fri, 6 May 2022 07:00:31 +0000 (10:00 +0300)]
doxygen comment for gv2gml.c
Costa Shulyupin [Fri, 6 May 2022 06:58:00 +0000 (09:58 +0300)]
doxygen comment for graphml2gv.c
Costa Shulyupin [Fri, 6 May 2022 06:57:43 +0000 (09:57 +0300)]
doxygen comment for gml2gv.h
Costa Shulyupin [Fri, 6 May 2022 06:57:25 +0000 (09:57 +0300)]
doxygen comment for gc.c
Costa Shulyupin [Fri, 6 May 2022 06:54:20 +0000 (09:54 +0300)]
doxygen comment for dijkstra.c
Costa Shulyupin [Fri, 6 May 2022 06:54:05 +0000 (09:54 +0300)]
doxygen comment for cvtgxl.c
Costa Shulyupin [Fri, 6 May 2022 06:53:33 +0000 (09:53 +0300)]
doxygen comment for convert.h
Costa Shulyupin [Fri, 6 May 2022 06:51:48 +0000 (09:51 +0300)]
doxygen comment for colxlate.c
Costa Shulyupin [Fri, 6 May 2022 06:51:16 +0000 (09:51 +0300)]
doxygen comment for ccomps.c
Costa Shulyupin [Fri, 6 May 2022 06:50:20 +0000 (09:50 +0300)]
doxygen comment for bcomps.c
Costa Shulyupin [Fri, 6 May 2022 06:48:15 +0000 (09:48 +0300)]
doxygen comment for acyclic.c
Matthew Fernandez [Thu, 26 May 2022 03:06:13 +0000 (03:06 +0000)]
Merge branch 'emitSearchGraph' into 'main'
fix emitSearchGraph for better representation
See merge request graphviz/graphviz!2647
Costa Shulyupin [Mon, 2 May 2022 03:18:08 +0000 (06:18 +0300)]
emitSearchGraph: show weights of search graph in labels
Before this patch using `weight` as `len` contradicted
predefined coordinates and changed layout.
Costa Shulyupin [Mon, 2 May 2022 03:10:07 +0000 (06:10 +0300)]
fix emitSearchGraph, use layout=neato and pos=x,y!
Function emitSearchGraph dumps internal state of
orthogonal routing search graph in dot format for debugging.
Output of the function is not used for final user output.
The functions already receives coordinates of nodes.
These coordinates should be used verbatim.
Before this patch `dot` changes locations of search graph nodes and
rendered output image is not useful.
This patch
- adds dummy layout `neato` because attribute `pos` is meaningful
for only for `neato` and `fdp`.
- adds "!" to force fixed positions by default.
Finally layout engine doesn't changes layout and positions of nodes.
References:
- https://graphviz.org/docs/attrs/pos/
- https://graphviz.org/docs/attr-types/point/
Matthew Fernandez [Thu, 26 May 2022 02:04:08 +0000 (02:04 +0000)]
Merge branch 'gvpr' into 'main'
Doxygen comments for gvpr
See merge request graphviz/graphviz!2648
Costa Shulyupin [Mon, 2 May 2022 14:52:15 +0000 (17:52 +0300)]
doxygen comment for lib/gvpr/gvpr.c
Costa Shulyupin [Mon, 2 May 2022 14:51:25 +0000 (17:51 +0300)]
doxygen comment for lib/gvpr/gvpr.h
Costa Shulyupin [Mon, 2 May 2022 14:50:10 +0000 (17:50 +0300)]
doxygen comment for cmd/gvpr
Matthew Fernandez [Wed, 25 May 2022 16:07:49 +0000 (16:07 +0000)]
Merge branch 'smattr/
C9DF4E16 -8634-4D4E-AAE0-
62E906147657 ' into 'main'
dotgen: squash -Wsign-conversion warning in 'doDot'
See merge request graphviz/graphviz!2692
Matthew Fernandez [Sun, 8 May 2022 20:02:31 +0000 (13:02 -0700)]
dotgen: squash -Wsign-conversion warning in 'doDot'
The compiler says:
dotinit.c: In function 'doDot':
dotinit.c:454:24: warning: conversion to 'unsigned int' from 'int' may change
the sign of the result [-Wsign-conversion]
454 | pinfo.margin = Pack;
| ^~~~
But from the surrounding code and the implementation of `getPack`, we can
statically determine that `Pack` is non-negative at this point.