Sophie

Sophie

distrib > Mageia > 8 > armv7hl > by-pkgid > 3911ba5411639f0a18f68578476bc3af > files > 2

clash-0.4.5-13.mga8.src.rpm

Index: pencilanimation_0.4.5b-rev5_src/src/graphics/vector/vectorimage.cpp
===================================================================
--- pencilanimation_0.4.5b-rev5_src.orig/src/graphics/vector/vectorimage.cpp
+++ pencilanimation_0.4.5b-rev5_src/src/graphics/vector/vectorimage.cpp
@@ -175,7 +175,7 @@ void VectorImage::removeCurveAt(int i) {
 
 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(static_cast<qreal>(newCurve.getWidth() / factor), static_cast<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
Index: pencilanimation_0.4.5b-rev5_src/src/interface/scribblearea.cpp
===================================================================
--- pencilanimation_0.4.5b-rev5_src.orig/src/interface/scribblearea.cpp
+++ pencilanimation_0.4.5b-rev5_src/src/interface/scribblearea.cpp
@@ -1667,7 +1667,7 @@ void ScribbleArea::drawLineTo(const QPoi
 			qreal distance = 4*QLineF(endPoint, lastBrushPoint).length();
 			qreal brushStep = 0.5*brush.width + 0.5*brush.feather;
 			if(usePressure) brushStep = brushStep*tabletPressure;
-			brushStep = qMax(1.0, brushStep);
+			brushStep = qMax(static_cast<qreal>(1.0), static_cast<qreal>(brushStep));
 			int steps = qRound( distance)/brushStep ;
 			
 			for(int i=0; i<steps; i++) {
@@ -2358,9 +2358,9 @@ void ScribbleArea::updateCursor() {
 				painter.drawLine( QPointF(width/2,width/2-2), QPointF(width/2,width/2+2) );
 				painter.setRenderHints(QPainter::Antialiasing, true);
 				painter.setPen( QColor(0,0,0,100) );
-				painter.drawEllipse( QRectF(1+brush.feather/2,1+brush.feather/2,qMax(0.0,brush.width-brush.feather/2-2),qMax(0.0,brush.width-brush.feather/2-2)) );
+				painter.drawEllipse( QRectF(1+brush.feather/2,1+brush.feather/2,qMax(static_cast<qreal>(0.0),static_cast<qreal>(brush.width-brush.feather/2-2)),qMax(static_cast<qreal>(0.0),static_cast<qreal>(brush.width-brush.feather/2-2))) );
 				painter.setPen( QColor(0,0,0,50) );
-				painter.drawEllipse( QRectF(1+brush.feather/8,1+brush.feather/8,qMax(0.0,width-brush.feather/4-2),qMax(0.0,width-brush.feather/4-2)) );
+				painter.drawEllipse( QRectF(1+brush.feather/8,1+brush.feather/8,qMax(static_cast<qreal>(0.0),static_cast<qreal>(width-brush.feather/4-2)),qMax(static_cast<qreal>(0.0),static_cast<qreal>(width-brush.feather/4-2))) );
 				painter.end();
 			}
 			setCursor(pixmap);