diff --git a/src/rrd_gfx.c b/src/rrd_gfx.c
index a71d43a01de5bfe95212b4c435a1383f8ca5f631..9c204f3bb0c57f21c54e8a301bf88749dd4e0020 100644 (file)
--- a/src/rrd_gfx.c
+++ b/src/rrd_gfx.c
/****************************************************************************
- * RRDtool 1.2.12 Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.19 Copyright by Tobi Oetiker, 1997-2007
****************************************************************************
* rrd_gfx.c graphics wrapper for rrdtool
**************************************************************************/
/* #define DEBUG */
-#ifdef DEBUG
-# define DPRINTF(...) fprintf(stderr, __VA_ARGS__);
-#else
-# define DPRINTF(...)
-#endif
+/* stupid MSVC doesnt support variadic macros = no debug for now! */
+#ifdef _MSC_VER
+# define RRDPRINTF()
+#else
+# ifdef DEBUG
+# define RRDPRINTF(...) fprintf(stderr, __VA_ARGS__);
+# else
+# define RRDPRINTF(...)
+# endif /* DEBUG */
+#endif /* _MSC_VER */
#include "rrd_tool.h"
#include <png.h>
#include <ft2build.h>
@@ -461,12 +466,12 @@ gfx_string gfx_string_create(gfx_canvas_t *canvas, FT_Face face,const char *text
canvas->aa_type == AA_LIGHT ? FT_LOAD_TARGET_LIGHT :
FT_LOAD_TARGET_MONO : FT_LOAD_TARGET_MONO);
if (error) {
- DPRINTF("couldn't load glyph: %c\n", letter)
+ RRDPRINTF("couldn't load glyph: %c\n", letter)
continue;
}
error = FT_Get_Glyph (slot, &glyph->image);
if (error) {
- DPRINTF("couldn't get glyph %c from slot %d\n", letter, (int)slot)
+ RRDPRINTF("couldn't get glyph %c from slot %d\n", letter, (int)slot)
continue;
}
/* if we are in tabbing mode, we replace the tab with a space and shift the position
@@ -488,7 +493,7 @@ gfx_string gfx_string_create(gfx_canvas_t *canvas, FT_Face face,const char *text
FT_Vector_Transform (&vec, &string->transform);
error = FT_Glyph_Transform (glyph->image, &string->transform, &vec);
if (error) {
- DPRINTF("couldn't transform glyph id %d\n", letter)
+ RRDPRINTF("couldn't transform glyph id %d\n", letter)
continue;
}
@@ -498,7 +503,7 @@ gfx_string gfx_string_create(gfx_canvas_t *canvas, FT_Face face,const char *text
canvas->aa_type == AA_LIGHT ? FT_RENDER_MODE_LIGHT :
FT_RENDER_MODE_MONO : FT_RENDER_MODE_MONO, 0, 1);
if (error) {
- DPRINTF("couldn't convert glyph id %d to bitmap\n", letter)
+ RRDPRINTF("couldn't convert glyph id %d to bitmap\n", letter)
continue;
}
/* long buf_x,comp_n; */
/* make copy to transform */
if (! glyph->image) {
- DPRINTF("no image\n")
+ RRDPRINTF("no image\n")
continue;
}
error = FT_Glyph_Copy (glyph->image, &image);
if (error) {
- DPRINTF("couldn't copy image\n")
+ RRDPRINTF("couldn't copy image\n")
continue;
}