From: Emden R. Gansner <erg@alum.mit.edu>
Date: Fri, 28 Feb 2014 20:10:45 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/ellson/graphviz
X-Git-Tag: 2.38.0~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df3e19d00f8fb2b53ad437fa08aa89ab49b32cf4;p=graphviz

Merge branch 'master' of https://github.com/ellson/graphviz

Conflicts:
	lib/sparse/DotIO.c
	lib/sparse/DotIO.h
---

df3e19d00f8fb2b53ad437fa08aa89ab49b32cf4
diff --cc lib/sparse/DotIO.c
index cc784fdcb,b2d564275..9afd01ee1
--- a/lib/sparse/DotIO.c
+++ b/lib/sparse/DotIO.c
@@@ -164,21 -173,23 +172,34 @@@ SparseMatrix_import_dot (Agraph_t* g, i
    for (n = agfstnode (g); n; n = agnxtnode (g, n))
      ND_id(n) = i++;
  
 +  if (format == FORMAT_COORD){
 +    A = SparseMatrix_new(i, i, nedges, MATRIX_TYPE_REAL, format);
 +    A->nz = nedges;
 +    I = A->ia;
 +    J = A->ja;
 +    val = (real*) A->a;
 +  } else {
 +    I = N_NEW(nedges, int);
 +    J = N_NEW(nedges, int);
 +    val = N_NEW(nedges, real);
 +  }
  
-   sym = agattr(g, AGEDGE, "weight", NULL); 
+ 
+   if (format == FORMAT_COORD){
+     A = SparseMatrix_new(i, i, nedges, MATRIX_TYPE_REAL, format);
+     A->nz = nedges;
+     I = A->ia;
+     J = A->ja;
+     val = (real*) A->a;
+   } else {
+     I = N_NEW(nedges, int);
+     J = N_NEW(nedges, int);
+     val = N_NEW(nedges, real);
+   }
+ 
+   sym = agfindedgeattr(g, "weight");
    if (D) {
-     symD = agattr(g, AGEDGE, "len", NULL); 
+     symD = agfindedgeattr(g, "len");
      valD = N_NEW(nedges, real);
    }
    i = 0;
diff --cc lib/sparse/DotIO.h
index 934693b23,8057421c1..acc6c1038
--- a/lib/sparse/DotIO.h
+++ b/lib/sparse/DotIO.h
@@@ -24,8 -24,11 +24,12 @@@ extern Agraph_t* SparseMatrix_read_dot(
  extern void setDotNodeID (Agnode_t* n, int v);
  extern int getDotNodeID (Agnode_t* n);
  
+ extern void attach_edge_colors(Agraph_t* g, int dim, real *colors);
+ 
+ extern void attach_embedding(Agraph_t *g, int dim, double sc, real *x);
+ 
  /* extern void attach_embedding(Agraph_t *g, int dim, double sc, real *x); */
 +extern void attach_edge_colors(Agraph_t* g, int dim, real *colors);
  extern SparseMatrix SparseMatrix_import_dot(Agraph_t* g, int dim, real **label_sizes, real **x, int *n_edge_label_nodes,
  					    int **edge_label_nodes, int format, SparseMatrix *D);
  extern Agraph_t* makeDotGraph (SparseMatrix, char *title, int dim, real *x, int with_color, int with_label, int use_matrix_value);