r18867 by jghali - fix msvc complain about ambiguous function call
scribus-commit
scribus-commit at lists.scribus.net
Sun Mar 2 21:54:18 UTC 2014
Author: jghali
Date: Sun Mar 2 21:54:17 2014
New Revision: 18867
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18867
Log:
fix msvc complain about ambiguous function call
Modified:
trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18867&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Sun Mar 2 21:54:17 2014
@@ -3647,9 +3647,9 @@
painter->setZoomFactor(2);
painter->rotate(-gStyle.hatchRotation);
painter->save();
- double xlen = sqrt((hw * 2) * (hw * 2)) * 2;
+ double xlen = sqrt((hw * 2.0) * (hw * 2.0)) * 2.0;
double dist = 0;
- while (dist < sqrt((hw * 2) * (hw * 2)) * 3)
+ while (dist < sqrt((hw * 2.0) * (hw * 2.0)) * 3.0)
{
painter->drawLine(QPointF(-xlen * 2, dist), QPointF(xlen * 2, dist));
painter->drawLine(QPointF(-xlen * 2, -dist), QPointF(xlen * 2, -dist));
@@ -3661,7 +3661,7 @@
painter->save();
painter->rotate(90);
dist = 0;
- while (dist < sqrt((hw * 2) * (hw * 2)) * 3)
+ while (dist < sqrt((hw * 2.0) * (hw * 2.0)) * 3.0)
{
painter->drawLine(QPointF(-xlen * 2, dist), QPointF(xlen * 2, dist));
painter->drawLine(QPointF(-xlen * 2, -dist), QPointF(xlen * 2, -dist));
@@ -3674,7 +3674,7 @@
painter->save();
painter->rotate(45);
dist = 0;
- while (dist < sqrt((hw * 2) * (hw * 2)) * 3)
+ while (dist < sqrt((hw * 2.0) * (hw * 2.0)) * 3.0)
{
painter->drawLine(QPointF(-xlen * 2, dist), QPointF(xlen * 2, dist));
painter->drawLine(QPointF(-xlen * 2, -dist), QPointF(xlen * 2, -dist));
More information about the scribus-commit
mailing list