Ticket #36397: patch-draw.c.diff

draw.c

@@ -8 +8 @@
 #include "jgraph.h"
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
 
 static char real_eof = EOF;
 
-float ctop(val, axis)
-float val;
-Axis axis;
+static void draw_footer(Graphs, int);
+static void draw_header(Graphs, int, int);
+static void draw_arrow(float, float, float, float, Curve);
+static void draw_mark(float, float, Curve, Graph);
+static void draw_curve(Curve, Graph);
+static void draw_label(Label);
+
+float ctop(float val, Axis axis)
 {
   if (axis->is_lg) {
     if (val <= 0.0) {
@@ -29 +35 @@
   }
 }
 
-float disttop(val, axis)
-float val;
-Axis axis;
+float disttop(float val, Axis axis)
 {
   if (axis->is_lg) {
     return FCPI * val;
@@ -40 +44 @@
   }
 }
 
-float intop(val)
-float val;
+float intop(float val)
 {
   return FCPI * val;
 }
 
 #define MAXIMUM(a,b) ((a > b) ? a : b)
 
-draw_axis(a, other)
-Axis a, other;
+void draw_axis(Axis a, Axis other)
 {
   char orientation;
   Hash h;
@@ -114 +116 @@
 }
 
 
-draw_label(l)
-Label l;
+void draw_label(Label l)
 {
   if (l->label == CNULL) return;
   comment(l->label);
   print_label(l);
 }
 
-set_clip(g)
-Graph g;
+static void set_clip(Graph g)
 {
   comment("Setting Clip");
   printf("newpath\n");
@@ -133 +133 @@
   printf("  closepath clip newpath\n");
 }
 
-draw_curves(g)
-Graph g;
+static void draw_curves(Graph g)
 {
   Curve c;
 
@@ -148 +147 @@
   printf("\n");
 }
 
-draw_curve(c, g)
-Curve c;
-Graph g;
+void draw_curve(Curve c, Graph g)
 {
   Point p, px, py;
   int i, j;
@@ -267 +264 @@
   printf("\n");
 }
 
-draw_mark(x, y, c, g)
-float x, y;
-Curve c;
-Graph g;
+void draw_mark(float x, float y, Curve c, Graph g)
 {
   Point p;
   float ms0, ms1, scx, scy, trx, try;
@@ -499 +493 @@
   grestore();
 }
 
-draw_arrow(x1, y1, x2, y2, c)
-float x1, y1, x2, y2;
-Curve c;
+void draw_arrow(float x1, float y1, float x2, float y2, Curve c)
 {
   float dx, dy;
   float ms0;
@@ -539 +531 @@
   printf("\n");
 }
 
-draw_legend(g)
-Graph g;
+static void draw_legend(Graph g)
 {
   Curve c;
   Legend l;
@@ -603 +594 @@
   printf("\n");
 }
 
-draw_strings(g)
-Graph g;
+static void draw_strings(Graph g)
 {
   String s;
 
@@ -613 +603 @@
     draw_label(s->s);
 }
 
-draw_graph(g)
-Graph g;
+static void draw_graph(Graph g)
 {
   comment("Drawing New Graph");
   printf("%f %f translate\n", g->x_translate, g->y_translate);
@@ -634 +623 @@
 
 }
 
-draw_graphs(gs, pp, landscape)
-Graphs gs;
-int pp;
-int landscape;
+void draw_graphs(Graphs gs, int pp, int landscape)
 {
   Graphs gs_p;
   Graph g;
@@ -651 +637 @@
   }
 }
 
-draw_header(gs, pp, landscape)
-Graphs gs;
-int pp;
-int landscape;
+void draw_header(Graphs gs, int pp, int landscape)
 {
   FILE *f;
   char c;
@@ -685 +668 @@
         (((11.0 * FCPI) - (gs->bb[3] - gs->bb[1])) / 2.0) - gs->bb[1]);     
     }
   } else if (landscape) {
-    printf("%f 0 translate\n", -gs->bb[2] - gs->bb[0]);
+    printf("%f 0 translate\n", (double)(-gs->bb[2] - gs->bb[0]));
   }
   printf("1 setlinecap 1 setlinejoin\n");
   printf("0.700 setlinewidth\n");
@@ -746 +729 @@
   }
 }
 
-draw_footer(gs, pp)
-Graphs gs;
-int pp;
+void draw_footer(Graphs gs, int pp)
 {
   FILE *f;
   char c;