From 77377ff6ac43512ee216af115a3e62c57a2484a3 Mon Sep 17 00:00:00 2001 From: oetiker Date: Sat, 23 Mar 2002 09:01:43 +0000 Subject: [PATCH] remove all traces of GIF and make PNG the default git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@101 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/Makefile.am | 1 - src/rrd_graph.c | 8 +------- src/rrd_graph.h | 2 +- src/rrd_tool.c | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 18d16a0..1ed0fdc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,7 +42,6 @@ INCLUDES = $(CGI_INCLUDES) $(FREETYPE_INCLUDES) $(ART_INCLUDES) \ RRD_C_FILES = \ getopt.c \ getopt1.c \ - gifsize.c \ parsetime.c \ hash_32.c \ rrd_hw.c \ diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 166d562..2e9e009 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -181,7 +181,6 @@ enum gf_en gf_conv(char *string){ enum if_en if_conv(char *string){ - conv_if(GIF,IF_GIF) conv_if(PNG,IF_PNG) return (-1); @@ -1849,9 +1848,6 @@ int lazy_check(image_desc_t *im){ if ((fd = fopen(im->graphfile,"rb")) == NULL) return 0; /* the file does not exist */ switch (im->imgformat) { - case IF_GIF: - size = GifSize(fd,&(im->xgif),&(im->ygif)); - break; case IF_PNG: size = PngSize(fd,&(im->xgif),&(im->ygif)); break; @@ -2271,8 +2267,6 @@ graph_paint(image_desc_t *im, char ***calcpr) } } switch (im->imgformat) { - case IF_GIF: - break; case IF_PNG: gfx_render_png (canvas,im->xgif,im->ygif,im->zoom,0x0,fo); break; @@ -2444,7 +2438,7 @@ rrd_graph_init(image_desc_t *im) im->gdes_c = 0; im->gdes = NULL; im->zoom = 1.0; - im->imgformat = IF_GIF; /* we default to GIF output */ + im->imgformat = IF_PNG; /* we default to PNG output */ for(i=0;igraph_col[i]=graph_col[i]; diff --git a/src/rrd_graph.h b/src/rrd_graph.h index b86859c..9df2144 100644 --- a/src/rrd_graph.h +++ b/src/rrd_graph.h @@ -25,7 +25,7 @@ enum gf_en {GF_PRINT=0,GF_GPRINT,GF_COMMENT,GF_HRULE,GF_VRULE,GF_LINE, GF_DEF, GF_CDEF, GF_VDEF, GF_PART}; -enum if_en {IF_GIF=0,IF_PNG=1}; +enum if_en {IF_PNG=0}; enum vdef_op_en { VDEF_MAXIMUM /* like the MAX in (G)PRINT */ diff --git a/src/rrd_tool.c b/src/rrd_tool.c index b1e0309..72fdddb 100644 --- a/src/rrd_tool.c +++ b/src/rrd_tool.c @@ -81,7 +81,7 @@ void PrintUsage(char *cmd) "\t\t[--units-exponent value]\n" "\t\t[--step seconds]\n" "\t\t[-f|--imginfo printfstr]\n" - "\t\t[-a|--imgformat GIF|PNG]\n" + "\t\t[-a|--imgformat PNG]\n" "\t\t[-c|--color COLORTAG#rrggbb[aa]] [-t|--title string]\n" "\t\t[DEF:vname=rrd:ds-name:CF]\n" "\t\t[CDEF:vname=rpn-expression]\n" -- 2.11.0