diff options
| author | Denis Declara <declara91@gmail.com> | 2012-04-01 15:49:05 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-04-01 15:49:05 +0000 |
| commit | ab4f61b539c21e5aa8aa6cca9bd5950b84bc33ee (patch) | |
| tree | 7fb9d8555d36fbdd8e7f1dec13ff46c1f5e160f8 /src/widgets/gradient-vector.cpp | |
| parent | Brought old code, "Rows and Columns" in it's own class. Added a separate clas... (diff) | |
| parent | fix XML output of guideline color (diff) | |
| download | inkscape-ab4f61b539c21e5aa8aa6cca9bd5950b84bc33ee.tar.gz inkscape-ab4f61b539c21e5aa8aa6cca9bd5950b84bc33ee.zip | |
Trunk merge
(bzr r11073.1.9)
Diffstat (limited to 'src/widgets/gradient-vector.cpp')
| -rw-r--r-- | src/widgets/gradient-vector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp index d6de0c492..3d6d5a8f2 100644 --- a/src/widgets/gradient-vector.cpp +++ b/src/widgets/gradient-vector.cpp @@ -682,7 +682,7 @@ static void offadjustmentChanged( GtkAdjustment *adjustment, GtkWidget *vb) } } -guint32 sp_average_color(guint32 c1, guint32 c2, gdouble p = 0.5) +guint32 sp_average_color(guint32 c1, guint32 c2, gdouble p/* = 0.5*/) { guint32 r = (guint32) (SP_RGBA32_R_U(c1) * p + SP_RGBA32_R_U(c2) * (1 - p)); guint32 g = (guint32) (SP_RGBA32_G_U(c1) * p + SP_RGBA32_G_U(c2) * (1 - p)); |