blob: e8b55fb88f61667bedb96ba59cb2e6c85f480de9 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
Backport of the the commit 486f618 to old marble.
From 486f6181d6fef15c9b6c72504e3588be502bea80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Nienh=C3=BCser?= <nienhueser@kde.org>
Date: Sun, 20 Mar 2016 17:43:25 +0100
Subject: [PATCH] Use std::isnan from cmath
--- src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.orig 2014-10-23 21:53:08 UTC
+++ src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
@@ -12,7 +12,7 @@
#include "GpsdThread.h"
#include "MarbleDebug.h"
-#include <math.h>
+#include <cmath>
using namespace Marble;
/* TRANSLATOR Marble::GpsdPositionProviderPlugin */
@@ -76,7 +76,7 @@ void GpsdPositionProviderPlugin::update(
{
PositionProviderStatus oldStatus = m_status;
GeoDataCoordinates oldPosition = m_position;
- if ( data.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) )
+ if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) )
m_status = PositionProviderStatusUnavailable;
else {
m_status = PositionProviderStatusAvailable;
@@ -88,29 +88,29 @@ void GpsdPositionProviderPlugin::update(
m_accuracy.level = GeoDataAccuracy::Detailed;
#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 )
- if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) {
+ if ( !std::isnan( data.fix.epx ) && !std::isnan( data.fix.epy ) ) {
m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy );
}
#else
- if ( !isnan( data.fix.eph ) ) {
+ if ( !std::isnan( data.fix.eph ) ) {
m_accuracy.horizontal = data.fix.eph;
}
#endif
- if ( !isnan( data.fix.epv ) ) {
+ if ( !std::isnan( data.fix.epv ) ) {
m_accuracy.vertical = data.fix.epv;
}
- if( !isnan(data.fix.speed ) )
+ if( !std::isnan(data.fix.speed ) )
{
m_speed = data.fix.speed;
}
- if( !isnan( data.fix.track ) )
+ if( !std::isnan( data.fix.track ) )
{
m_track = data.fix.track;
}
- if ( !isnan( data.fix.time ) )
+ if ( !std::isnan( data.fix.time ) )
{
m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time * 1000 );
}
|