summaryrefslogtreecommitdiffstats
path: root/src/2geom/affine.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
committerMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
commit5a4fb2325f60d292b47330f540b26a3279341c90 (patch)
treed2aa7967be25450b83e625025366c618101ae49f /src/2geom/affine.cpp
parentThe Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff)
parentRemove Snap menu item and improve grid menu item text (diff)
downloadinkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz
inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/2geom/affine.cpp')
-rw-r--r--src/2geom/affine.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/2geom/affine.cpp b/src/2geom/affine.cpp
index 0ef6d2708..738d0fc48 100644
--- a/src/2geom/affine.cpp
+++ b/src/2geom/affine.cpp
@@ -454,8 +454,7 @@ Eigen::Eigen(Affine const &m) {
}
}
-static void quadratic_roots(double q0, double q1, double q2, int &n, double&r0, double&r1) {
- std::vector<double> r;
+static void quadratic_roots(const double q0, const double q1, const double q2, int &n, double&r0, double&r1) {
if(q2 == 0) {
if(q1 == 0) { // zero or infinite roots
n = 0;