Merge branch 'master' into fox-gui - gsl-shell.git - gsl-shell

index : gsl-shell.git
gsl-shell
summary refs log tree commit diff
path: root/agg-plot/plot.h
diff options
context:
space:
mode:
authorFrancesco Abbate <francesco.bbt@gmail.com>2012年08月11日 12:07:39 +0200
committerFrancesco Abbate <francesco.bbt@gmail.com>2012年08月11日 12:07:39 +0200
commit427d762746455aaf88b2935de122e7201634d8f8 (patch)
tree82bc9a370c9bf64da6b5350594f80bc93dc5e1e7 /agg-plot/plot.h
parent1167a7ac6cd85e18b7ed45aafef41601de2b1cb9 (diff)
parent5ae3556a85ec812736c5c68af6499c1350268e4e (diff)
downloadgsl-shell-427d762746455aaf88b2935de122e7201634d8f8.tar.gz
Merge branch 'master' into fox-gui
Conflicts: agg-plot/canvas-window-cpp.h agg-plot/window-cpp.h makepackages
Diffstat (limited to 'agg-plot/plot.h')
-rw-r--r--agg-plot/plot.h 2
1 files changed, 1 insertions, 1 deletions
diff --git a/agg-plot/plot.h b/agg-plot/plot.h
index 9cfb159b..fbc6707c 100644
--- a/agg-plot/plot.h
+++ b/agg-plot/plot.h
@@ -796,7 +796,7 @@ void plot<RM>::draw_axis(canvas_type& canvas, agg::trans_affine& canvas_mtx,
{
draw::text* label = labels[j];
label->apply_transform(m, 1.0);
- canvas.draw(*label, agg::rgba(0, 0, 0));
+ canvas.draw(*label, colors::black);
}
lndash.add_dash(7.0, 3.0);
generated by cgit v1.2.3 (git 2.39.1) at 2025年09月12日 21:06:53 +0000

AltStyle によって変換されたページ (->オリジナル) /