Merge commit 'origin/master' into charset

[pspp-builds.git] / src / output / charts / piechart.c

diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c
index aeac555c261fcd3ea563febdd1bbaddacccd787c..4eeb10ca63af06f70f764477cd0865401c34a8c0 100644 (file)
--- a/src/output/charts/piechart.c
+++ b/src/output/charts/piechart.c
@@ -96,7 +96,7 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
       draw_segment(ch,
                   centre_x, centre_y, radius,
                   angle, segment_angle,
-                  data_colour[i]);
+                  data_colour[i % N_CHART_COLOURS]);
 
       /* Now add the labels */
       if ( label_x < centre_x )
@@ -104,7 +104,7 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
          pl_line_r(ch->lp, label_x, label_y,
                    left_label, label_y );
          pl_moverel_r(ch->lp,0,5);
-         pl_alabel_r(ch->lp,0,0,slices[i].label);
+         pl_alabel_r (ch->lp, 0, 0, ds_cstr (&slices[i].label));
        }
       else
        {
@@ -113,7 +113,7 @@ piechart_plot(const char *title, const struct slice *slices, int n_slices)
                    right_label, label_y
                    );
          pl_moverel_r(ch->lp,0,5);
-         pl_alabel_r(ch->lp,'r',0,slices[i].label);
+         pl_alabel_r (ch->lp, 'r', 0, ds_cstr (&slices[i].label));
        }
 
       angle += segment_angle;