fix refs to job struct

diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
index ad09308344e643f8c1c4db3f110aae788f93b759..d3f278a486c4aaa4ba1b93d50d5d5c63f5709cb6 100644 (file)
--- a/tclpkg/tcldot/tcldot.c
+++ b/tclpkg/tcldot/tcldot.c
@@ -1120,7 +1120,7 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp,
        Output_lang = gvc->job->output_lang;
        Output_file = gvc->job->output_file;
 #endif
-       gvc->codegen = &TK_CodeGen;
+       gvc->job->codegen = &TK_CodeGen;
        /* emit graph in sorted order, all nodes then all edges */
        emit_graph(gvc, g, EMIT_SORTED);
        gvrender_delete_jobs(gvc);
@@ -1163,7 +1163,7 @@ static int graphcmd(ClientData clientData, Tcl_Interp * interp,
        /* set default margins for current output format */
        dotneato_set_margins(gvc, g);
        /* render graph to open GD structure */
-       gvc->codegen = &memGD_CodeGen;
+       gvc->job->codegen = &memGD_CodeGen;
        /* emit graph in sorted order, all nodes then all edges */
        emit_graph(gvc, g, 1);
        gvrender_delete_jobs(gvc);

diff --git a/tclpkg/tcldot/tkgen.c b/tclpkg/tcldot/tkgen.c
index c3c15fda6d607a92d95fd1da82f672fa4caf5ec6..7502bb86b33c40d394f48d6ad0e0f246f84b5406 100644 (file)
--- a/tclpkg/tcldot/tkgen.c
+++ b/tclpkg/tcldot/tkgen.c
@@ -195,11 +195,11 @@ static void tk_begin_graph(GVC_t * gvc, graph_t * g, box bb, point pb)
        dpi = DEFAULT_DPI;
     DevScale = dpi / POINTS_PER_INCH;
 
-    Viewport.x = gvc->width;
-    Viewport.y = gvc->height;
+    Viewport.x = gvc->job->width;
+    Viewport.y = gvc->job->height;
     if (Viewport.x) {
-       Zoom = gvc->zoom;
-       GraphFocus = gvc->focus;
+       Zoom = gvc->job->zoom;
+       GraphFocus = gvc->job->focus;
     } else {
        Viewport.x =
            (bb.UR.x - bb.LL.x + 2 * GD_drawing(g)->margin.x) * DevScale +