diff -Nru pencil-0.4.4b/debian/changelog pencil-0.4.4b/debian/changelog --- pencil-0.4.4b/debian/changelog 2010-02-13 21:16:54.000000000 +0000 +++ pencil-0.4.4b/debian/changelog 2010-09-19 13:51:29.000000000 +0100 @@ -1,3 +1,11 @@ +pencil (0.4.4b-0ubuntu3) maverick; urgency=low + + * armel-qmax-fix: + - Fixes non existent call to qMax(qreal, double) on armel bug + by casting double arg to qreal (LP: #642117) + + -- Niall Creech Sun, 19 Sep 2010 13:50:10 +0100 + pencil (0.4.4b-0ubuntu2) lucid; urgency=low * New patches: diff -Nru pencil-0.4.4b/debian/patches/armel-qmax-fix pencil-0.4.4b/debian/patches/armel-qmax-fix --- pencil-0.4.4b/debian/patches/armel-qmax-fix 1970-01-01 01:00:00.000000000 +0100 +++ pencil-0.4.4b/debian/patches/armel-qmax-fix 2010-09-19 13:52:20.000000000 +0100 @@ -0,0 +1,18 @@ +Author: Niall Creech +Description: Fixes non existent call to qMax(qreal, double) on armel bug + by casting double arg to qreal +Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/pencil/+bug/642117 +Index: kamoso-1.0.5/src/kamoso.cpp +Index: pencil-0.4.4b/src/graphics/vector/vectorimage.cpp +=================================================================== +--- pencil-0.4.4b.orig/src/graphics/vector/vectorimage.cpp 2010-09-19 13:49:29.635388320 +0100 ++++ pencil-0.4.4b/src/graphics/vector/vectorimage.cpp 2010-09-19 13:49:51.082583853 +0100 +@@ -175,7 +175,7 @@ + + void VectorImage::addCurve(BezierCurve &newCurve, qreal factor) { + if(newCurve.getVertexSize() < 1) return; // security - a new curve should have a least 2 vertices +- qreal tol = qMax(newCurve.getWidth() / factor, 3.0 / factor); // tolerance for taking the intersection as an existing vertex on a curve ++ qreal tol = qMax(newCurve.getWidth() / factor, qreal(3.0 / factor)); // tolerance for taking the intersection as an existing vertex on a curve + //qDebug() << "tolerance" << tol; + // finds if the new curve interesects itself + for(int k=0; k < newCurve.getVertexSize(); k++) { // for each cubic section of the new curve diff -Nru pencil-0.4.4b/debian/patches/series pencil-0.4.4b/debian/patches/series --- pencil-0.4.4b/debian/patches/series 2010-02-13 21:15:33.000000000 +0000 +++ pencil-0.4.4b/debian/patches/series 2010-09-19 13:48:18.000000000 +0100 @@ -1,2 +1,3 @@ ming_api.patch no_libpng.patch +armel-qmax-fix