Fix no longer correct use of GD_rankdir in dotsplines.c

diff --git a/lib/common/input.c b/lib/common/input.c
index 036bb33361c236132294d831a6c3e095d95035ae..ab11b58223d57902f533b3916cb2c9868dad463d 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -506,9 +506,9 @@ void graph_init(graph_t * g, boolean use_rankdir)
            rankdir = RANKDIR_RL;
     }
     if (use_rankdir)
-       g->u.rankdir = (rankdir << 2) || rankdir;
+       SET_RANKDIR (g, (rankdir << 2) || rankdir);
     else
-       g->u.rankdir = (rankdir << 2);
+       SET_RANKDIR (g, (rankdir << 2));
 
     xf = late_double(g, agfindattr(g, "nodesep"), DEFAULT_NODESEP,
                     MIN_NODESEP);

diff --git a/lib/common/macros.h b/lib/common/macros.h
index 59776c8aa1a1ee20fa13128affbe8c4ca1a78c9b..d3ecaf8f923a0c2eaadb2ebb3667a2ce35341bdf 100644 (file)
--- a/lib/common/macros.h
+++ b/lib/common/macros.h
@@ -113,6 +113,8 @@
 #define HAS_CLUST_EDGE(g) (GD_flags(g) & 1)
 #define SET_CLUST_EDGE(g) (GD_flags(g) |= 1)
 
+#define SET_RANKDIR(g,rd) ((g)->u.rankdir = (rd))
+
 #ifndef streq
 #define streq(a,b)             (*(a)==*(b)&&!strcmp(a,b))
 #endif

diff --git a/lib/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c
index d592051ac4f48201feb6635f13df9e274f23894d..74de052625625e423079817adf63edb642435d56 100644 (file)
--- a/lib/dotgen/dotsplines.c
+++ b/lib/dotgen/dotsplines.c
@@ -637,9 +637,9 @@ cloneGraph (graph_t* g)
 
     GD_charset(auxg) = GD_charset (g);
     if (GD_flip(g))
-       GD_rankdir(auxg) = RANKDIR_TB;
+       SET_RANKDIR(auxg, RANKDIR_TB);
     else
-       GD_rankdir(auxg) = RANKDIR_LR;
+       SET_RANKDIR(auxg, RANKDIR_LR);
     GD_nodesep(auxg) = GD_nodesep(g);
     GD_ranksep(auxg) = GD_ranksep(g);