move render_id from GVC_t to gvrender_job_t

eliminate lots of gvc->job dereferencing

diff --git a/lib/gvc/gvcint.h b/lib/gvc/gvcint.h
index 84f77533d7dfe20980ff22dc31b04b14b81449df..578b3c25c907377222b295ee0750ead6093aaf74 100644 (file)
--- a/lib/gvc/gvcint.h
+++ b/lib/gvc/gvcint.h
@@ -36,6 +36,8 @@ extern "C" {
        FILE *output_file;
        int output_lang;
 
+       int render_id;          /* internal id of current render */
+
        void *surface;          /* gd or cairo surface */
        boolean external_surface; /* surface belongs to caller */
 
@@ -139,7 +141,6 @@ extern "C" {
        /* gvrender_begin_job() */
        gvrender_engine_t *render_engine;       /* current render engine */
        gvrender_features_t *render_features;   /* features of current render */
-       int render_id;          /* internal id of current render */
 #ifndef DISABLE_CODEGENS
        codegen_t *codegen;
 #endif

diff --git a/lib/gvc/gvemit.c b/lib/gvc/gvemit.c
index be84b0c9c4f7e4f6e4302e4b51a416b220395951..7ef36322933970ca857a9ec4221f9e01d9e09aef 100644 (file)
--- a/lib/gvc/gvemit.c
+++ b/lib/gvc/gvemit.c
@@ -34,6 +34,7 @@ extern void emit_graph(GVC_t * gvc, graph_t * g, int flags);
 
 #define PANFACTOR 10
 #define ZOOMFACTOR 1.1
+#define EPSILON .0001
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
 
@@ -298,8 +299,6 @@ static void win_handle_button_press(gvrender_job_t * job, XButtonEvent *bev)
     job->oldy = bev->y;
 }
 
-#define EPSILON .0001
-
 static void win_handle_motion(gvrender_job_t * job, XMotionEvent *mev)
 {
     double dx = mev->x - job->oldx;

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index 268c39d920295eac32c732f0c24197968eebf9a6..b3e08b0ff732f53540b5cedb1a262019e931f938 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -72,7 +72,7 @@ int gvrender_select(GVC_t * gvc, char *str)
            gvc->render_engine = (gvrender_engine_t *) (typeptr->engine);
            gvc->render_features =
                (gvrender_features_t *) (typeptr->features);
-           gvc->render_id = typeptr->id;
+           gvc->job->render_id = typeptr->id;
            return GVRENDER_PLUGIN;
 #ifndef DISABLE_CODEGENS
        }