From debc9599032c7036006ec124f4ef8f44b8935568 Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Thu, 17 Jun 2010 19:32:24 +0000
Subject: *** empty log message ***

---
 src/drv/cdpdf.c | 6 +++---
 src/drv/cdps.c  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/drv')

diff --git a/src/drv/cdpdf.c b/src/drv/cdpdf.c
index 58cf474..3211cba 100644
--- a/src/drv/cdpdf.c
+++ b/src/drv/cdpdf.c
@@ -876,7 +876,7 @@ static void cdfpoly(cdCtxCanvas *ctxcanvas, int mode, cdfPoint* poly, int n)
 
 static int cdlinestyle(cdCtxCanvas *ctxcanvas, int style)
 {
-  double mm = (72.0/25.4) / ctxcanvas->scale;
+  double mm = ctxcanvas->canvas->xres;
   char options[200];
 
   switch (style)
@@ -901,12 +901,12 @@ static int cdlinestyle(cdCtxCanvas *ctxcanvas, int style)
   case CD_CUSTOM :
     {
       int i;
-
+      /* size here is in pixels, do not use mm */
       strcpy(options, "dasharray={");
       for (i = 0; i < ctxcanvas->canvas->line_dashes_count; i++)
       {
         char tmp[80];
-        sprintf(tmp, "%g ", ctxcanvas->canvas->line_dashes[i]*mm);
+        sprintf(tmp, "%g ", (double)ctxcanvas->canvas->line_dashes[i]);
         strcat(options, tmp);
       }
       strcat(options, "}");
diff --git a/src/drv/cdps.c b/src/drv/cdps.c
index 37bdef6..08d6ba7 100644
--- a/src/drv/cdps.c
+++ b/src/drv/cdps.c
@@ -1454,7 +1454,7 @@ static void cdfpoly(cdCtxCanvas *ctxcanvas, int mode, cdfPoint* poly, int n)
 
 static int cdlinestyle(cdCtxCanvas *ctxcanvas, int style)
 {
-  double mm = (72.0/25.4) / ctxcanvas->scale;
+  double mm = ctxcanvas->canvas->xres;
 
   if (ctxcanvas->debug) fprintf(ctxcanvas->file, "\n%%cdLineStyle %d Begin\n", style);
 
@@ -1479,9 +1479,9 @@ static int cdlinestyle(cdCtxCanvas *ctxcanvas, int style)
     break;
   case CD_CUSTOM :
     {
-      int i;
+      int i;  /* size here is in pixels, do not use mm */
       for (i = 0; i < ctxcanvas->canvas->line_dashes_count; i++)
-        fprintf(ctxcanvas->file, "%g ", ctxcanvas->canvas->line_dashes[i]*mm);
+        fprintf(ctxcanvas->file, "%g ", (double)ctxcanvas->canvas->line_dashes[i]);
     }
     break;
   }
-- 
cgit v1.2.3