From c13edab979886a7dc0a23e8bf8b5da77fb5676de Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sat, 15 Sep 2007 16:37:27 +0000 Subject: Refactoring SPColor to C++ and removing legacy CMYK implementation (bzr r3753) --- src/extension/paramcolor.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/extension/paramcolor.cpp') diff --git a/src/extension/paramcolor.cpp b/src/extension/paramcolor.cpp index e051fc8dc..d31dc907c 100644 --- a/src/extension/paramcolor.cpp +++ b/src/extension/paramcolor.cpp @@ -86,14 +86,13 @@ ParamColor::get_widget (SPDocument * doc, Inkscape::XML::Node * node, sigc::sign { _changeSignal = new sigc::signal(*changeSignal); Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); - SPColorSelector* spColorSelector = (SPColorSelector*)sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK, SP_COLORSPACE_TYPE_RGB); + SPColorSelector* spColorSelector = (SPColorSelector*)sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK); ColorSelector* colorSelector = spColorSelector->base; if (_value < 1) { _value = 0xFF000000; } - SPColor *color = new SPColor(); - sp_color_set_rgb_rgba32(color, _value); + SPColor *color = new SPColor( _value ); float alpha = (_value & 0xff) / 255.0F; colorSelector->setColorAlpha(*color, alpha); @@ -113,7 +112,7 @@ sp_color_param_changed(SPColorSelector *csel, GObject *obj) float alpha = csel->base->getAlpha(); ParamColor* ptr = (ParamColor*)obj; - ptr->set(sp_color_get_rgba32_falpha(&color, alpha), NULL, NULL); + ptr->set(color.toRGBA32( alpha ), NULL, NULL); ptr->_changeSignal->emit(); } -- cgit v1.2.3