diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-04-27 18:23:29 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-04-27 18:23:29 +0000 |
| commit | b96a42f69c88422e0df06c9d664cf242e7dfdec5 (patch) | |
| tree | 3a3f984020bef55f3c8e1cc7b4cf9a242164fc33 /src/color.cpp | |
| parent | merge from trunk (r12281) (diff) | |
| parent | modify bbox width for Blur filter in Fill & Stroke (Bug 1171208) (diff) | |
| download | inkscape-b96a42f69c88422e0df06c9d664cf242e7dfdec5.tar.gz inkscape-b96a42f69c88422e0df06c9d664cf242e7dfdec5.zip | |
merge from trunk (r12305)
(bzr r11668.1.68)
Diffstat (limited to 'src/color.cpp')
| -rw-r--r-- | src/color.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/color.cpp b/src/color.cpp index 0a07d3f21..5eb0d91ef 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -99,9 +99,7 @@ bool SPColor::operator == (SPColor const& other) const */ bool SPColor::isClose( SPColor const& other, float epsilon ) const { - bool match = false; - - match = (fabs((v.c[0]) - (other.v.c[0])) < epsilon) + bool match = (fabs((v.c[0]) - (other.v.c[0])) < epsilon) && (fabs((v.c[1]) - (other.v.c[1])) < epsilon) && (fabs((v.c[2]) - (other.v.c[2])) < epsilon); |