[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] krita/plugins/extensions/clonesarray: atan2 can have either double or float arguments on
From:       Andrius da Costa Ribas <andriusmao () gmail ! com>
Date:       2013-11-30 19:14:34
Message-ID: E1Vmpzu-0002Dv-Mn () scm ! kde ! org
[Download RAW message or body]

Git commit 4a5cd098caf178bd395143c2af271672a1db6545 by Andrius da Costa Ribas.
Committed on 30/11/2013 at 18:11.
Pushed by andriusr into branch 'master'.

atan2 can have either double or float arguments on MSVC, conversion from int is \
ambiguous.

M  +2    -2    krita/plugins/extensions/clonesarray/dlg_clonesarray.cpp

http://commits.kde.org/calligra/4a5cd098caf178bd395143c2af271672a1db6545

diff --git a/krita/plugins/extensions/clonesarray/dlg_clonesarray.cpp \
b/krita/plugins/extensions/clonesarray/dlg_clonesarray.cpp index d068b20..b034f75 \
                100644
--- a/krita/plugins/extensions/clonesarray/dlg_clonesarray.cpp
+++ b/krita/plugins/extensions/clonesarray/dlg_clonesarray.cpp
@@ -122,12 +122,12 @@ void DlgClonesArray::syncOrthogonalToAngular()
     x = m_page->columnXOffset->value();
     y = m_page->columnYOffset->value();
     m_page->columnDistance->setValue((float)sqrt(pow2(x) + pow2(y)));
-    m_page->columnAngle->setValue(kisRadiansToDegrees(atan2(y, x)));
+    m_page->columnAngle->setValue(kisRadiansToDegrees(atan2((double) y, (double) \
x)));  
     x = m_page->rowXOffset->value();
     y = m_page->rowYOffset->value();
     m_page->rowDistance->setValue((float)sqrt(pow2(x) + pow2(y)));
-    m_page->rowAngle->setValue(kisRadiansToDegrees(atan2(y, x)));
+    m_page->rowAngle->setValue(kisRadiansToDegrees(atan2((double) y, (double) x)));
 
     setAngularSignalsEnabled(true);
     setDirty();


[prev in list] [next in list] [prev in thread] [next in thread]