diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-09-25 02:54:32 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-09-25 02:54:32 +0000 |
| commit | ba9fad5667d32413d00b2b628c305bdb5bd129de (patch) | |
| tree | aa0bcfd18d50709f953e7c0d023b2ed3eb0e016d /src/dialogs | |
| parent | Fixed const (diff) | |
| download | inkscape-ba9fad5667d32413d00b2b628c305bdb5bd129de.tar.gz inkscape-ba9fad5667d32413d00b2b628c305bdb5bd129de.zip | |
Initial support for icc color selection including CMYK
(bzr r3794)
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/fill-style.cpp | 6 | ||||
| -rw-r--r-- | src/dialogs/stroke-style.cpp | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/dialogs/fill-style.cpp b/src/dialogs/fill-style.cpp index 1dfaea546..3c0620feb 100644 --- a/src/dialogs/fill-style.cpp +++ b/src/dialogs/fill-style.cpp @@ -211,11 +211,7 @@ sp_fill_style_widget_update (SPWidget *spw) SP_PAINT_SELECTOR_FILLRULE_NONZERO : SP_PAINT_SELECTOR_FILLRULE_EVENODD); if (query->fill.set && query->fill.isColor()) { - gfloat d[3]; - sp_color_get_rgb_floatv (&query->fill.value.color, d); - SPColor color( d[0], d[1], d[2] ); - sp_paint_selector_set_color_alpha (psel, &color, SP_SCALE24_TO_FLOAT (query->fill_opacity.value)); - + sp_paint_selector_set_color_alpha (psel, &query->fill.value.color, SP_SCALE24_TO_FLOAT (query->fill_opacity.value)); } else if (query->fill.set && query->fill.isPaintserver()) { SPPaintServer *server = SP_STYLE_FILL_SERVER (query); diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp index 9dc7131fc..08f3d9031 100644 --- a/src/dialogs/stroke-style.cpp +++ b/src/dialogs/stroke-style.cpp @@ -248,10 +248,7 @@ sp_stroke_style_paint_update (SPWidget *spw) sp_update_pattern_list (psel, pat); } } else if (query->stroke.set && query->stroke.isColor()) { - gfloat d[3]; - sp_color_get_rgb_floatv (&query->stroke.value.color, d); - SPColor color( d[0], d[1], d[2] ); - sp_paint_selector_set_color_alpha (psel, &color, SP_SCALE24_TO_FLOAT (query->stroke_opacity.value)); + sp_paint_selector_set_color_alpha (psel, &query->stroke.value.color, SP_SCALE24_TO_FLOAT (query->stroke_opacity.value)); } break; |