projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMake for MS Windows command line
[platform/core/uifw/dali-adaptor.git]
/
third-party
/
glyphy
/
glyphy-geometry.hh
diff --git
a/third-party/glyphy/glyphy-geometry.hh
b/third-party/glyphy/glyphy-geometry.hh
index
c9b26ef
..
bf76761
100644
(file)
--- a/
third-party/glyphy/glyphy-geometry.hh
+++ b/
third-party/glyphy/glyphy-geometry.hh
@@
-588,7
+588,10
@@
inline double Arc::extended_dist (const Point &p) const {
Point m = p0.lerp (.5, p1);
Vector dp = p1 - p0;
Vector pp = dp.ortho ();
Point m = p0.lerp (.5, p1);
Vector dp = p1 - p0;
Vector pp = dp.ortho ();
- float d2 = tan2atan (d);
+ /*
+ * In the original file, there was no explicit cast to float.
+ */
+ float d2 = static_cast<float>( tan2atan (d) );
if ((p - m) * (p1 - m) < 0)
return (p - p0) * (pp + dp * d2).normalized ();
else
if ((p - m) * (p1 - m) < 0)
return (p - p0) * (pp + dp * d2).normalized ();
else