diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index 8a3eded40e50085d05c54204d3fe5042e23bb2e2..a00924029c8970d5d427f380099ad4057d824ea7 100644 (file)
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
{
stop->offset = 0.0;
stop->currentColor = false;
- sp_color_set_rgb_rgba32(&stop->specified_color, 0x000000ff);
+ stop->specified_color.set( 0x000000ff );
stop->opacity = 1.0;
}
stop->currentColor = true;
} else {
guint32 const color = sp_svg_read_color(p, 0);
- sp_color_set_rgb_rgba32(&stop->specified_color, color);
+ stop->specified_color.set( color );
}
}
{
} else {
stop->currentColor = false;
guint32 const color = sp_svg_read_color(p, 0);
- sp_color_set_rgb_rgba32(&stop->specified_color, color);
+ stop->specified_color.set( color );
}
}
object->requestModified(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
repr = xml_doc->createElement("svg:stop");
}
- guint32 specifiedcolor = sp_color_get_rgba32_ualpha(&stop->specified_color, 255);
+ guint32 specifiedcolor = stop->specified_color.toRGBA32( 255 );
gfloat opacity = stop->opacity;
if (((SPObjectClass *) stop_parent_class)->write)
os << "currentColor";
} else {
gchar c[64];
- sp_svg_write_color(c, 64, specifiedcolor);
+ sp_svg_write_color(c, sizeof(c), specifiedcolor);
os << c;
}
os << ";stop-opacity:" << opacity;
rgb0 | 0xff);
return rgb0 | alpha;
} else {
- return sp_color_get_rgba32_falpha(&stop->specified_color, stop->opacity);
+ return stop->specified_color.toRGBA32( stop->opacity );
}
}
if (str) {
color = sp_svg_read_color(str, dfl);
}
- SPColor ret;
- sp_color_set_rgb_rgba32(&ret, color);
+ SPColor ret( color );
return ret;
} else {
return stop->specified_color;
gr->modified_connection = ref->connectModified(sigc::bind<2>(sigc::ptr_fun(&gradient_ref_modified), gr));
}
- // Per SVG, all unset attributes must be inherited from linked gradient.
+ // Per SVG, all unset attributes must be inherited from linked gradient.
// So, as we're now (re)linked, we assign linkee's values to this gradient if they are not yet set -
- // but without setting the _set flags.
+ // but without setting the _set flags.
// FIXME: do the same for gradientTransform too
if (!gr->units_set)
gr->units = sp_gradient_get_units (gr);
if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) {
sp_gradient_ensure_colors(gr);
}
-
+
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
/* strictly speaking, offset an SVG <number> rather than a CSS one, but exponents make no
* sense for offset proportions. */
gchar c[64];
- sp_svg_write_color(c, 64, sp_color_get_rgba32_ualpha(&gr->vector.stops[i].color, 0x00));
+ sp_svg_write_color(c, sizeof(c), gr->vector.stops[i].color.toRGBA32( 0x00 ));
os << "stop-color:" << c << ";stop-opacity:" << gr->vector.stops[i].opacity;
child->setAttribute("style", os.str().c_str());
/* Order will be reversed here */
static void
-gradient_ref_modified(SPObject *href, guint flags, SPGradient *gradient)
+gradient_ref_modified(SPObject */*href*/, guint /*flags*/, SPGradient *gradient)
{
if (sp_gradient_invalidate_vector(gradient)) {
SP_OBJECT(gradient)->requestModified(SP_OBJECT_MODIFIED_FLAG);
{
SPGradientStop gstop;
gstop.offset = 0.0;
- sp_color_set_rgb_rgba32(&gstop.color, 0x00000000);
+ gstop.color.set( 0x00000000 );
gstop.opacity = 0.0;
gr->vector.stops.push_back(gstop);
}
{
SPGradientStop gstop;
gstop.offset = 1.0;
- sp_color_set_rgb_rgba32(&gstop.color, 0x00000000);
+ gstop.color.set( 0x00000000 );
gstop.opacity = 0.0;
gr->vector.stops.push_back(gstop);
}
// If the first one is not at 0, then insert a copy of the first at 0.
SPGradientStop gstop;
gstop.offset = 0.0;
- sp_color_copy(&gstop.color, &gr->vector.stops.front().color);
+ gstop.color = gr->vector.stops.front().color;
gstop.opacity = gr->vector.stops.front().opacity;
gr->vector.stops.insert(gr->vector.stops.begin(), gstop);
}
// If the last one is not at 1, then insert a copy of the last at 1.
SPGradientStop gstop;
gstop.offset = 1.0;
- sp_color_copy(&gstop.color, &gr->vector.stops.back().color);
+ gstop.color = gr->vector.stops.back().color;
gstop.opacity = gr->vector.stops.back().opacity;
gr->vector.stops.push_back(gstop);
}
}
for (guint i = 0; i < gr->vector.stops.size() - 1; i++) {
- guint32 color = sp_color_get_rgba32_falpha(&gr->vector.stops[i].color,
- gr->vector.stops[i].opacity);
+ guint32 color = gr->vector.stops[i].color.toRGBA32( gr->vector.stops[i].opacity );
gint r0 = (color >> 24) & 0xff;
gint g0 = (color >> 16) & 0xff;
gint b0 = (color >> 8) & 0xff;
gint a0 = color & 0xff;
- color = sp_color_get_rgba32_falpha(&gr->vector.stops[i + 1].color,
- gr->vector.stops[i + 1].opacity);
+ color = gr->vector.stops[i + 1].color.toRGBA32( gr->vector.stops[i + 1].opacity );
gint r1 = (color >> 24) & 0xff;
gint g1 = (color >> 16) & 0xff;
gint b1 = (color >> 8) & 0xff;
*/
void
sp_gradient_render_vector_block_rgb(SPGradient *gradient, guchar *buf,
- gint const width, gint const height, gint const rowstride,
+ gint const width, gint const height, gint const /*rowstride*/,
gint const pos, gint const span, bool const horizontal)
{
g_return_if_fail(gradient != NULL);
@@ -1473,7 +1470,7 @@ sp_lineargradient_write(SPObject *object, Inkscape::XML::Node *repr, guint flags
static SPPainter *
sp_lineargradient_painter_new(SPPaintServer *ps,
NR::Matrix const &full_transform,
- NR::Matrix const &parent_transform,
+ NR::Matrix const &/*parent_transform*/,
NRRect const *bbox)
{
SPLinearGradient *lg = SP_LINEARGRADIENT(ps);
}
static void
-sp_lineargradient_painter_free(SPPaintServer *ps, SPPainter *painter)
+sp_lineargradient_painter_free(SPPaintServer */*ps*/, SPPainter *painter)
{
g_free(painter);
}
@@ -1759,7 +1756,7 @@ sp_radialgradient_write(SPObject *object, Inkscape::XML::Node *repr, guint flags
static SPPainter *
sp_radialgradient_painter_new(SPPaintServer *ps,
NR::Matrix const &full_transform,
- NR::Matrix const &parent_transform,
+ NR::Matrix const &/*parent_transform*/,
NRRect const *bbox)
{
SPRadialGradient *rg = SP_RADIALGRADIENT(ps);
}
static void
-sp_radialgradient_painter_free(SPPaintServer *ps, SPPainter *painter)
+sp_radialgradient_painter_free(SPPaintServer */*ps*/, SPPainter *painter)
{
g_free(painter);
}