diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-03-06 23:39:08 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-03-06 23:39:08 +0000 |
| commit | eecc8d1bbf0f87e3b01528ca5e3cecc3955214d4 (patch) | |
| tree | df79bfdfd52fde9845d04ca4d2498fbac0852a12 /src | |
| parent | fix invalid access warning (diff) | |
| download | inkscape-eecc8d1bbf0f87e3b01528ca5e3cecc3955214d4.tar.gz inkscape-eecc8d1bbf0f87e3b01528ca5e3cecc3955214d4.zip | |
a better fix: we don't need prev to hold opacity at all
(bzr r2560)
Diffstat (limited to 'src')
| -rw-r--r-- | src/desktop-style.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index b29c32f7b..789bcf4d0 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -413,8 +413,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill c[0] = c[1] = c[2] = c[3] = 0.0; gint num = 0; - gfloat prev[4]; - prev[0] = prev[1] = prev[2] = prev[3] = 0.0; + gfloat prev[3]; + prev[0] = prev[1] = prev[2] = 0.0; bool same_color = true; for (GSList const *i = objects; i != NULL; i = i->next) { @@ -476,7 +476,7 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_COLOR) { - gfloat d[4]; + gfloat d[3]; sp_color_get_rgb_floatv (&paint->value.color, d); // Check if this color is the same as previous @@ -484,9 +484,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill prev[0] = d[0]; prev[1] = d[1]; prev[2] = d[2]; - prev[3] = d[3]; } else { - if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2] || prev[3] != d[3])) + if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2])) same_color = false; } |