diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-09-15 16:37:27 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-09-15 16:37:27 +0000 |
| commit | c13edab979886a7dc0a23e8bf8b5da77fb5676de (patch) | |
| tree | d0af3cb43043747680e49269441978694656e6f8 /src/style.cpp | |
| parent | avoid code duplication, i.e. use sp_item_snappoints in the object-snapper.cpp (diff) | |
| download | inkscape-c13edab979886a7dc0a23e8bf8b5da77fb5676de.tar.gz inkscape-c13edab979886a7dc0a23e8bf8b5da77fb5676de.zip | |
Refactoring SPColor to C++ and removing legacy CMYK implementation
(bzr r3753)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/style.cpp b/src/style.cpp index 70e294848..b817ce083 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -3521,7 +3521,7 @@ sp_paint_differ(SPIPaint const *const a, SPIPaint const *const b) } if ( a->isColor() ) { - return !(sp_color_is_equal(&a->value.color, &b->value.color) + return !( (a->value.color == b->value.color) && ((a->value.iccColor == b->value.iccColor) || (a->value.iccColor && b->value.iccColor && (a->value.iccColor->colorProfile == b->value.iccColor->colorProfile) @@ -3578,7 +3578,7 @@ sp_style_write_ipaint(gchar *b, gint const len, gchar const *const key, css << " "; } char color_buf[8]; - sp_svg_write_color(color_buf, sizeof(color_buf), sp_color_get_rgba32_ualpha(&paint->value.color, 0)); + sp_svg_write_color(color_buf, sizeof(color_buf), paint->value.color.toRGBA32( 0 )); css << color_buf; } @@ -3691,7 +3691,7 @@ void SPIPaint::clear() currentcolor = false; colorSet = false; noneSet = false; - sp_color_set_rgb_rgba32( &value.color, 0 ); + value.color.set( 0 ); if ( value.href && value.href->getObject() ) { value.href->detach(); |