Index: lib/common/diagen.c =================================================================== RCS file: /home/cvsroot/graphviz2/lib/common/diagen.c,v retrieving revision 1.33 diff -u -r1.33 diagen.c --- lib/common/diagen.c 12 Feb 2009 17:47:24 -0000 1.33 +++ lib/common/diagen.c 27 Mar 2009 21:46:39 -0000 @@ -24,6 +24,7 @@ #ifdef HAVE_UNISTD_H #include #endif +#undef HAVE_LIBZ /* FIXME: only testing the uncompressed code */ #ifdef HAVE_LIBZ #include #endif @@ -85,6 +86,8 @@ #ifdef HAVE_LIBZ static gzFile Zfile; +#else +static FILE *file; #endif static int dia_fputs(char *s) @@ -96,7 +99,7 @@ #ifdef HAVE_LIBZ return gzwrite(Zfile, s, (unsigned) len); #else - return 0; + return fwrite(s, 1, len, file); #endif } @@ -130,7 +133,7 @@ #ifdef HAVE_LIBZ return gzwrite(Zfile, buf, (unsigned) len); #else - return 0; + return fwrite(buf, 1, len, file); #endif } @@ -271,20 +274,17 @@ Scale * (cp->penwidth)); dia_fputs(" \n"); } - if (cp->pen == P_DASHED) { + if (cp->pen == P_DASHED || cp->pen == P_DOTTED) { dia_fputs(" \n"); - dia_printf(" \n", 1); + dia_printf(" \n", cp->pen == P_DASHED ? 1 : 4); dia_fputs(" \n"); -#if 0 - } else if (cp->pen == P_DOTTED) { - dia_printf("stroke-dasharray:%s;", sdotarray); -#endif } } static void dia_grstylefill(context_t * cp, int filled) { if (filled) { + /* 'inner_color' only for (box|ellipse|) */ dia_fputs(" \n"); dia_printf(" \n", dia_resolve_color(cp->fillcolor)); @@ -317,9 +317,7 @@ exit(1); } #else - agerr(AGERR, - "No support for compressed output. Not compiled with zlib.\n"); - exit(1); + file = ofp; #endif /* Pages = pages; */ @@ -658,6 +656,8 @@ { int conn = 0; + /* TODO: rather than calculating we could just use the 'mainpoint' introduced 2005, here: 9 */ + if (cp.x == p.x) { if (cp.y > p.y) conn = 1; @@ -855,6 +855,7 @@ else conn_t = ellipse_connection(cp_t, diapt(A[n - 1])); } else if (strcmp(shape_t, "record") == 0) { + /* FIXME: implement something */ } else { if (agisdirected(Rootgraph)) conn_t = box_connection(tail, diapt(A[0])); Index: lib/gvc/gvconfig.c =================================================================== RCS file: /home/cvsroot/graphviz2/lib/gvc/gvconfig.c,v retrieving revision 1.108 diff -u -r1.108 gvconfig.c --- lib/gvc/gvconfig.c 26 Mar 2009 16:12:17 -0000 1.108 +++ lib/gvc/gvconfig.c 27 Mar 2009 21:46:40 -0000 @@ -457,9 +457,7 @@ {&PIC_CodeGen, "pic", PIC_format}, {&VTX_CodeGen, "vtx", VTX}, {&MP_CodeGen, "mp", METAPOST}, -#ifdef HAVE_LIBZ {&DIA_CodeGen, "dia", DIA}, -#endif {NULL, NULL, 0} };