X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcharts%2Fscatterplot-cairo.c;h=cf62539fab1d5b29e2b65e11a225f2b9bbfba9ed;hb=855eaf1506f0ea76a8bbfb3bbfd456524f4edeca;hp=736d5e2ae7102c210f4022bf89ef6a37c77fd9aa;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp

diff --git a/src/output/charts/scatterplot-cairo.c b/src/output/charts/scatterplot-cairo.c
index 736d5e2ae7..cf62539fab 100644
--- a/src/output/charts/scatterplot-cairo.c
+++ b/src/output/charts/scatterplot-cairo.c
@@ -28,6 +28,7 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+static const struct xrchart_colour black = {0,0,0};
 
 void
 xrchart_draw_scatterplot (const struct chart_item *chart_item, cairo_t *cr,
@@ -45,12 +46,14 @@ xrchart_draw_scatterplot (const struct chart_item *chart_item, cairo_t *cr,
   int byvar_width = 0;
   int i = 0;
   const struct xrchart_colour *colour;
-  
+
   if (spc->byvar)
     byvar_width = var_get_width (spc->byvar);
 
-  xrchart_write_xscale (cr, geom, spc->x_min, spc->x_max);
-  xrchart_write_yscale (cr, geom, spc->y_min, spc->y_max);
+  if (! xrchart_write_xscale (cr, geom, spc->x_min, spc->x_max))
+    return;
+  if (! xrchart_write_yscale (cr, geom, spc->y_min, spc->y_max))
+    return;
   xrchart_write_title (cr, geom, _("Scatterplot %s"), chart_item->title);
   xrchart_write_xlabel (cr, geom, spc->xlabel);
   xrchart_write_ylabel (cr, geom, spc->ylabel);
@@ -87,13 +90,16 @@ xrchart_draw_scatterplot (const struct chart_item *chart_item, cairo_t *cr,
 		  i--;
 		}
 	    }
+          colour = &data_colour[i % XRCHART_N_COLOURS];
 	}
-      colour = &data_colour[i % XRCHART_N_COLOURS];
+      else
+        colour = &black;
+
       cairo_set_source_rgb (cr,
                             colour->red / 255.0,
                             colour->green / 255.0,
                             colour->blue / 255.0);
-    
+
       xrchart_datum (cr, geom, 0,
 		     case_data_idx (c, SP_IDX_X)->f,
 		     case_data_idx (c, SP_IDX_Y)->f);