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

List:       kde-commits
Subject:    Re: [calligra/frameworks] libs/flake: Use std::isfinite() instead of isfinite().
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2015-03-23 8:31:46
Message-ID: alpine.LNX.2.00.1503230931090.32148 () calcifer ! valdyas ! org
[Download RAW message or body]

I doubt that very much, seeing that I built flake without problems on 
opensuse 13.2 without this change.

On Sun, 22 Mar 2015, Inge Wallin wrote:

> Git commit bc19e3b37b8e76117732fd640e2cf913a43e9363 by Inge Wallin.
> Committed on 22/03/2015 at 23:00.
> Pushed by ingwa into branch 'frameworks'.
> 
> Use std::isfinite() instead of isfinite().
> 
> This is apparently necessary on OpenSUSE 13.2 and maybe other versions too.
> 
> M  +7    -7    libs/flake/KoSnapStrategy.cpp
> 
> http://commits.kde.org/calligra/bc19e3b37b8e76117732fd640e2cf913a43e9363
> 
> diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
> index fd9de8e..f7e3fb4 100644
> --- a/libs/flake/KoSnapStrategy.cpp
> +++ b/libs/flake/KoSnapStrategy.cpp
> @@ -75,7 +75,7 @@ OrthogonalSnapStrategy::OrthogonalSnapStrategy()
> 
> bool OrthogonalSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * \
> proxy, qreal maxSnapDistance) {
> -    Q_ASSERT(isfinite(maxSnapDistance));
> +    Q_ASSERT(std::isfinite(maxSnapDistance));
> QPointF horzSnap, vertSnap;
> qreal minVertDist = HUGE_VAL;
> qreal minHorzDist = HUGE_VAL;
> @@ -140,7 +140,7 @@ NodeSnapStrategy::NodeSnapStrategy()
> 
> bool NodeSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * proxy, \
> qreal maxSnapDistance) {
> -    Q_ASSERT(isfinite(maxSnapDistance));
> +    Q_ASSERT(std::isfinite(maxSnapDistance));
> const qreal maxDistance = maxSnapDistance * maxSnapDistance;
> qreal minDistance = HUGE_VAL;
> 
> @@ -178,7 +178,7 @@ ExtensionSnapStrategy::ExtensionSnapStrategy()
> 
> bool ExtensionSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * proxy, \
> qreal maxSnapDistance) {
> -    Q_ASSERT(isfinite(maxSnapDistance));
> +    Q_ASSERT(std::isfinite(maxSnapDistance));
> 
> const qreal maxDistance = maxSnapDistance * maxSnapDistance;
> qreal minDistances[2] = { HUGE_VAL, HUGE_VAL };
> @@ -380,7 +380,7 @@ IntersectionSnapStrategy::IntersectionSnapStrategy()
> 
> bool IntersectionSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy \
> *proxy, qreal maxSnapDistance) {
> -    Q_ASSERT(isfinite(maxSnapDistance));
> +    Q_ASSERT(std::isfinite(maxSnapDistance));
> const qreal maxDistance = maxSnapDistance * maxSnapDistance;
> qreal minDistance = HUGE_VAL;
> 
> @@ -427,7 +427,7 @@ GridSnapStrategy::GridSnapStrategy()
> 
> bool GridSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy *proxy, qreal \
> maxSnapDistance) {
> -    Q_ASSERT(isfinite(maxSnapDistance));
> +    Q_ASSERT(std::isfinite(maxSnapDistance));
> if (! proxy->canvas()->snapToGrid())
> return false;
> 
> @@ -492,7 +492,7 @@ BoundingBoxSnapStrategy::BoundingBoxSnapStrategy()
> 
> bool BoundingBoxSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy \
> *proxy, qreal maxSnapDistance) {
> -    Q_ASSERT(isfinite(maxSnapDistance));
> +    Q_ASSERT(std::isfinite(maxSnapDistance));
> const qreal maxDistance = maxSnapDistance * maxSnapDistance;
> qreal minDistance = HUGE_VAL;
> 
> @@ -579,7 +579,7 @@ LineGuideSnapStrategy::LineGuideSnapStrategy()
> 
> bool LineGuideSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * proxy, \
> qreal maxSnapDistance) {
> -    Q_ASSERT(isfinite(maxSnapDistance));
> +    Q_ASSERT(std::isfinite(maxSnapDistance));
> 
> KoGuidesData * guidesData = proxy->canvas()->guidesData();
> 
> 


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