X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_gfx.c;h=7084720bc259b7bd1884a0e127aeaa651e5cc033;hb=8b72aa265bde592af7e13220a3484c5657d6ffaf;hp=eb46ba92121f775e487f11533ba86d7d76004694;hpb=cd9bdc9dd1cd1655e4b63f9382afad8cbec0a8ee;p=rrdtool.git diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c index eb46ba9..7084720 100644 --- a/src/rrd_gfx.c +++ b/src/rrd_gfx.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.2.9 Copyright by Tobi Oetiker, 1997-2005 + * RRDtool 1.2.11 Copyright by Tobi Oetiker, 1997-2005 **************************************************************************** * rrd_gfx.c graphics wrapper for rrdtool **************************************************************************/ @@ -7,9 +7,9 @@ /* #define DEBUG */ #ifdef DEBUG -# define DPRINTF(x,...) fprintf(stderr, x, ## __VA_ARGS__); +# define DPRINTF(...) fprintf(stderr, __VA_ARGS__); #else -# define DPRINTF(x,...) +# define DPRINTF(...) #endif #include "rrd_tool.h" #include @@ -386,7 +386,11 @@ gfx_string gfx_string_create(gfx_canvas_t *canvas, FT_Face face,const char *text cstr = malloc(sizeof(wchar_t) * clen); /* yes we are allocating probably too much here, I know */ string->count=mbstowcs(cstr,text,clen); if ( string->count == -1){ - string->count=mbstowcs(cstr,"Enc-Err",6); + /* conversion did not work, so lets fall back to just use what we got */ + string->count=clen-1; + for(n=0;text[n] != '\0';n++){ + cstr[n]=(unsigned char)text[n]; + } } #else char *cstr = strdup(text);