cleanup some unused headers after FILE output consolidation

diff --git a/lib/gvc/gvplugin_loadimage.h b/lib/gvc/gvplugin_loadimage.h
index 8a2e6c63605244bfd34204b487dbe6318948cad1..66180ccfa787e4c71fb845d25869beacd78a84dd 100644 (file)
--- a/lib/gvc/gvplugin_loadimage.h
+++ b/lib/gvc/gvplugin_loadimage.h
@@ -21,6 +21,9 @@
 #include "gvplugin.h"
 #include "gvcjob.h"
 
+extern void gvdevice_fputs(GVJ_t * job, char *s);
+extern void gvdevice_printf(GVJ_t * job, const char *format, ...);
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/plugin/core/gvloadimage_core.c b/plugin/core/gvloadimage_core.c
index ddf2d7cda980106feea98898cd8b8b5957f19e7c..12bfe3ce748393dc0049cacea1972ed9150f11bc 100644 (file)
--- a/plugin/core/gvloadimage_core.c
+++ b/plugin/core/gvloadimage_core.c
@@ -20,13 +20,7 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
-#ifdef WIN32
-#include <io.h>
-#endif
 #include <sys/stat.h>
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #if HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
@@ -58,13 +52,13 @@ static void core_loadimage_svg(GVJ_t * job, usershape_t *us, boxf b, boolean fil
     gvdevice_fputs(job, "<image xlink:href=\"");
     gvdevice_fputs(job, us->name);
     if (job->rotation) {
-        gvdevice_printg (job, "\" width=\"%gpx\" height=\"%gpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
+        gvdevice_printf (job, "\" width=\"%gpx\" height=\"%gpx\" preserveAspectRatio=\"xMidYMid meet\" x=\"%g\" y=\"%g\"",
             b.UR.y - b.LL.y, b.UR.x - b.LL.x, b.LL.x, b.UR.y);
-        gvdevice_printg (job, " transform=\"rotate(%d %g %g)\"",
+        gvdevice_printf (job, " transform=\"rotate(%d %g %g)\"",
             job->rotation, b.LL.x, b.UR.y);
     }
     else {
-        gvdevice_printg (job, "\" width=\"%gpx\" height=\"%gpx\" preserveAspectRatio=\"xMinYMin meet\" x=\"%g\" y=\"%g\"",
+        gvdevice_printf (job, "\" width=\"%gpx\" height=\"%gpx\" preserveAspectRatio=\"xMinYMin meet\" x=\"%g\" y=\"%g\"",
             b.UR.x - b.LL.x, b.UR.y - b.LL.y, b.LL.x, -b.UR.y);
     }
     gvdevice_fputs(job, "/>\n");
@@ -99,12 +93,12 @@ static void core_loadimage_fig(GVJ_t * job, usershape_t *us, boxf bf, boolean fi
 
     BF2B(bf, b);
 
-    gvdevice_printg(job, "%d %d %d %d %d %d %d %d %d %.1f %d %d %d %d %d %d\n %d %s\n",
+    gvdevice_printf(job, "%d %d %d %d %d %d %d %d %d %.1f %d %d %d %d %d %d\n %d %s\n",
             object_code, sub_type, line_style, thickness, pen_color,
             fill_color, depth, pen_style, area_fill, style_val, join_style,
             cap_style, radius, forward_arrow, backward_arrow, npoints,
             flipped, us->name);
-    gvdevice_printg(job," %d %d %d %d %d %d %d %d %d %d\n",
+    gvdevice_printf(job," %d %d %d %d %d %d %d %d %d %d\n",
            b.LL.x, b.LL.y,
            b.LL.x, b.UR.y,
            b.UR.x, b.UR.y,

diff --git a/plugin/core/gvrender_core_ps.c b/plugin/core/gvrender_core_ps.c
index 3c347602471a299fe3467a690a65584c4cbc5481..fe01cb1acef51b5f793f7b3785632d14c9244b71 100644 (file)
--- a/plugin/core/gvrender_core_ps.c
+++ b/plugin/core/gvrender_core_ps.c
@@ -18,19 +18,9 @@
 #include "config.h"
 #endif
 
-#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef HAVE_LIBZ
-#include <zlib.h>
-#endif
-
-#ifdef WIN32
-#include <io.h>
-#include "compat.h"
-#endif
-
 #include "gvplugin_render.h"
 #include "graph.h"
 #include "agxbuf.h"

diff --git a/plugin/gd/gvloadimage_gd.c b/plugin/gd/gvloadimage_gd.c
index 4d3a82173a899b0ea15f0415820a70d62f3159ef..3cab9e3e5bf1e31ad6052433e3a2c49c5df222c0 100644 (file)
--- a/plugin/gd/gvloadimage_gd.c
+++ b/plugin/gd/gvloadimage_gd.c
@@ -22,13 +22,6 @@
 #include <stddef.h>
 #include <string.h>
 
-#ifdef HAVE_LIBZ
-#include <zlib.h>
-#ifdef WIN32
-#include <io.h>
-#endif
-#endif
-
 #include "gvplugin_loadimage.h"
 
 #ifdef HAVE_LIBGD