allow --color arguments with RRGGBB and not only RRGGBBAA

[rrdtool.git] / src / rrd_gfx.c

diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index 77a213c..8686d3d 100644 (file)
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2rc3  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2rc5  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd_gfx.c  graphics wrapper for rrdtool
   **************************************************************************/
@@ -519,29 +519,29 @@ int           gfx_render_png (gfx_canvas_t *canvas,
         case GFX_AREA: {   
             ArtVpath *vec,*pvec;
             double dst[6];     
-            ArtSVP *svp,*usvp,*rsvp;
+            ArtSVP *svp,*svpt;
             art_affine_scale(dst,canvas->zoom,canvas->zoom);
             vec = art_vpath_affine_transform(node->path,dst);
            if (node->closed_path)
                gfx_libart_close_path(node, &vec);
-           gfx_round_scaled_coordinates(vec);
+           /* gfx_round_scaled_coordinates(vec); */
             pvec = art_vpath_perturb(vec);
            art_free(vec);
             if(node->type == GFX_LINE){
                 svp = art_svp_vpath_stroke ( pvec, ART_PATH_STROKE_JOIN_ROUND,
                                              ART_PATH_STROKE_CAP_ROUND,
-                                             node->size*canvas->zoom,1,1);
+                                             node->size*canvas->zoom,4,0.25);
             } else {
-                svp = art_svp_from_vpath ( pvec );
+                svp  = art_svp_from_vpath ( pvec );
+                svpt = art_svp_uncross( svp );
+                art_free(svp);
+               svp  = art_svp_rewind_uncrossed(svpt,ART_WIND_RULE_NONZERO); 
+                art_free(svpt);
             }
             art_free(pvec);
-            usvp=art_svp_uncross(svp);
-            art_free(svp);
-           rsvp=art_svp_rewind_uncrossed(usvp,ART_WIND_RULE_ODDEVEN); 
-            art_free(usvp); 
-            art_rgb_svp_alpha (rsvp ,0,0, pys_width, pys_height,
+            art_rgb_svp_alpha (svp ,0,0, pys_width, pys_height,
                                node->color, buffer, rowstride, NULL);
-            art_free(rsvp);
+            art_free(svp);
             break;
         }
         case GFX_TEXT: {
@@ -1337,7 +1337,7 @@ static int eps_prologue(eps_state *state)
   gfx_node_t *node;
   fputs(
     "%!PS-Adobe-3.0 EPSF-3.0\n"
-    "%%Creator: RRDtool 1.2rc3 Tobias Oetiker, http://tobi.oetiker.ch\n"
+    "%%Creator: RRDtool 1.2rc5 Tobias Oetiker, http://tobi.oetiker.ch\n"
     /* can't like weird chars here */
     "%%Title: (RRDtool output)\n"
     "%%DocumentData: Clean7Bit\n"