X-Git-Url: https://git.octo.it/?p=rrdtool.git;a=blobdiff_plain;f=src%2Frrd_gfx.h;h=8dfc6d3dc8517c3b44ad148a5165bb9da4bb665f;hp=dafd7d061443cdd656761b7a3be7b47fbf49e8f2;hb=f9e5bd6a9d41c4607291cbbd88280129184ab325;hpb=d0371d8311c9008255a6e50ff296f349f74e10e5

diff --git a/src/rrd_gfx.h b/src/rrd_gfx.h
index dafd7d0..8dfc6d3 100644
--- a/src/rrd_gfx.h
+++ b/src/rrd_gfx.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.1.x  Copyright Tobias Oetiker, 1997 - 2001
+ * RRDtool 1.2rc6  Copyright by Tobi Oetiker, 1997-2005
  ****************************************************************************
  * rrd_gfx.h generic graphics adapter library
  ****************************************************************************/
@@ -7,7 +7,10 @@
 #ifndef  RRD_GFX_H
 #define RRD_GFX_H
 #define LIBART_COMPILATION
-#include <libart.h>
+
+#include <libart_lgpl/libart.h>
+#include <libart_lgpl/art_rgba.h>
+#include "art_rgba_svp.h"
 
 enum gfx_if_en {IF_PNG=0,IF_SVG,IF_EPS,IF_PDF};
 enum gfx_en { GFX_LINE=0,GFX_AREA,GFX_TEXT };
@@ -20,13 +23,12 @@ typedef struct  gfx_node_t {
   gfx_color_t   color;        /* color of element  0xRRGGBBAA  alpha 0xff is solid*/
   double        size;         /* font size, line width */
   double        dash_on, dash_off; /* dash line fragments lengths */
-  ArtVpath      *path;        /* path */
   int           closed_path;
   int           points;
   int           points_max;
-  ArtSVP        *svp;         /* svp */
   char *filename;             /* font or image filename */
   char *text;
+  ArtVpath      *path;        /* path */
   double        x,y;          /* position */
   double        angle;        /* text angle */
   enum gfx_h_align_en halign; /* text alignement */
@@ -101,8 +103,7 @@ int           gfx_destroy    (gfx_canvas_t *canvas);
 int       gfx_render_png (gfx_canvas_t *canvas,
                               art_u32 width, art_u32 height,
                               gfx_color_t background, FILE *fo);
-double gfx_get_text_width_libart ( gfx_canvas_t *canvas,
-			    double start, char* font, double size,
+double gfx_get_text_width_libart ( double start, char* font, double size,
 			    double tabwidth, char* text, int rotation);
 
 /* SVG support */