From: Emden R. Gansner Date: Thu, 10 Oct 2013 19:42:25 +0000 (-0400) Subject: Use a local copy of Agdirected because linkage doesn't work with the X-Git-Tag: LAST_LIBGRAPH~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5de42cdd2b21c5bbb4c1fb26a76adec7d36c0519;p=graphviz Use a local copy of Agdirected because linkage doesn't work with the release version of Windows. --- diff --git a/lib/common/htmltable.c b/lib/common/htmltable.c index f36ae7636..039eb6780 100644 --- a/lib/common/htmltable.c +++ b/lib/common/htmltable.c @@ -1490,6 +1490,7 @@ void makeGraphs(htmltbl_t * tbl, graph_t * rowg, graph_t * colg) #else e = agedge(rowg, t, h); #endif + y = 0; for (r = 0; r < cp->rspan; r++) y += minr[cp->row + r]; @@ -1548,6 +1549,9 @@ void sizeArray(htmltbl_t * tbl) { graph_t *rowg; graph_t *colg; +#ifdef WIN32 + Agdesc_t dir = { 1, 0, 0, 1 }; +#endif /* Do the 1D cases by hand */ if ((tbl->rc == 1) || (tbl->cc == 1)) { @@ -1559,8 +1563,13 @@ void sizeArray(htmltbl_t * tbl) tbl->widths = N_NEW(tbl->cc + 1, int); #ifdef WITH_CGRAPH +#ifdef WIN32 + rowg = agopen("rowg", dir, NIL(Agdisc_t *)); + colg = agopen("colg", dir, NIL(Agdisc_t *)); +#else rowg = agopen("rowg", Agdirected, NIL(Agdisc_t *)); colg = agopen("colg", Agdirected, NIL(Agdisc_t *)); +#endif /* Only need GD_nlist */ agbindrec(rowg, "Agraphinfo_t", sizeof(Agraphinfo_t), TRUE); // graph custom data agbindrec(colg, "Agraphinfo_t", sizeof(Agraphinfo_t), TRUE); // graph custom data