allow plugin renderers to set asymmetric dpi

diff --git a/lib/common/emit.c b/lib/common/emit.c
index 130952187872783ca8aab7cc8f5ef5bdc170feb1..301641407193d47b3c50d32a90f2759882970d52 100644 (file)
--- a/lib/common/emit.c
+++ b/lib/common/emit.c
@@ -1127,21 +1127,21 @@ static void init_job_margin(GVJ_t *job)
 static void init_job_dpi(GVJ_t *job, graph_t *g)
 {
     if (GD_drawing(g)->dpi != 0) {
-        job->dpi.x = job->dpi.y = GD_drawing(g)->dpi;
+        job->dpi.x = job->dpi.y = (double)(GD_drawing(g)->dpi);
     }
     else {
         /* set default margins depending on format */
         switch (job->output_lang) {
         case GVRENDER_PLUGIN:
-            job->dpi.x = job->dpi.y = job->render.features->default_dpi;
+            job->dpi = job->render.features->default_dpi;
             break;
         case POSTSCRIPT:
         case PDF:
         case SVG:
-           job->dpi.x = job->dpi.y = POINTS_PER_INCH;
+           job->dpi.x = job->dpi.y = (double)(POINTS_PER_INCH);
             break;
         default:
-            job->dpi.x = job->dpi.y = DEFAULT_DPI;
+            job->dpi.x = job->dpi.y = (double)(DEFAULT_DPI);
             break;
         }
     }

diff --git a/lib/gvc/gvcjob.h b/lib/gvc/gvcjob.h
index 28892cb56aeb77cdc1c84f7715ced12e7baaaa55..5d6b67c897e2fb6be23f7634d2fcd3931b9f6e47 100644 (file)
--- a/lib/gvc/gvcjob.h
+++ b/lib/gvc/gvcjob.h
@@ -68,7 +68,7 @@ extern "C" {
     typedef struct {
        int flags;
        double default_margin; /* graph units */
-       int default_dpi;
+       pointf default_dpi;
        char **knowncolors;
        int sz_knowncolors;
        color_type_t color_type;

diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index 0be0c546b9a9e7faad48b6a6709d9f34d19539e8..15dbc83c72130ab81d4853df7fafdce7a9899a0d 100644 (file)
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -769,7 +769,7 @@ static gvrender_features_t gdgen_features_tc = {
     GVRENDER_DOES_TRUECOLOR
        | GVRENDER_Y_GOES_DOWN, /* flags */
     0,                         /* default margin - points */
-    96,                                /* default dpi */
+    {96.,96.},                 /* default dpi */
     NULL,                      /* knowncolors */
     0,                         /* sizeof knowncolors */
     RGBA_BYTE,                 /* color_type */
@@ -779,7 +779,7 @@ static gvrender_features_t gdgen_features_tc = {
 static gvrender_features_t gdgen_features = {
     GVRENDER_Y_GOES_DOWN,      /* flags */
     0,                         /* default margin - points */
-    96,                                /* default dpi */
+    {96.,96.},                 /* default dpi */
     NULL,                      /* knowncolors */
     0,                         /* sizeof knowncolors */
     RGBA_BYTE,                 /* color_type */