diff options
| author | bouyer <bouyer@pkgsrc.org> | 2016-07-18 14:23:46 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2016-07-18 14:23:46 +0000 |
| commit | 6e6d7e689009be66019ab95f93952af52fe15db0 (patch) | |
| tree | c422d320021efcd484ffa86452f36f0e5db134ba /geography/opencpn-plugin-weather_routing/patches | |
| parent | ef3884567afaf6facb9ad309c3f89ea3b8be7f06 (diff) | |
| download | pkgsrc-6e6d7e689009be66019ab95f93952af52fe15db0.tar.gz | |
Update to 20160716. Changes since previous:
bug fixes, improved error messages, updates for newer draw plugin.
Diffstat (limited to 'geography/opencpn-plugin-weather_routing/patches')
| -rw-r--r-- | geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp b/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp index 64ae66f3fcd..b2f6da994b0 100644 --- a/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp +++ b/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp @@ -1,16 +1,16 @@ -$NetBSD: patch-src_RouteMap.cpp,v 1.1 2016/06/16 16:03:55 bouyer Exp $ +$NetBSD: patch-src_RouteMap.cpp,v 1.2 2016/07/18 14:23:46 bouyer Exp $ ---- src/RouteMap.cpp.orig 2016-06-13 18:14:41.000000000 +0200 -+++ src/RouteMap.cpp 2016-06-13 18:17:23.000000000 +0200 -@@ -550,7 +550,7 @@ +--- src/RouteMap.cpp.orig 2016-07-16 16:02:32.000000000 +0200 ++++ src/RouteMap.cpp 2016-07-18 15:51:20.000000000 +0200 +@@ -546,7 +546,7 @@ VB = polar.Speed(H, VW); /* failed to determine speed.. */ - if(isnan(B) || isnan(VB)) { + if(std::isnan(B) || std::isnan(VB)) { + // when does this hit?? + printf("polar failed bad! %f %f %f %f\n", W, VW, B, VB); configuration.polar_failed = true; - return false; //B = VB = 0; - } @@ -662,7 +662,7 @@ B = W + H; /* rotated relative to true wind */ @@ -20,7 +20,7 @@ $NetBSD: patch-src_RouteMap.cpp,v 1.1 2016/06/16 16:03:55 bouyer Exp $ double bearing3 = heading_resolve(B); if((bearing1 > bearing2 && bearing3 > bearing2 && bearing3 < bearing1) || (bearing1 < bearing2 && (bearing3 > bearing2 || bearing3 < bearing1))) { -@@ -2092,7 +2092,7 @@ +@@ -2089,7 +2089,7 @@ /* did we tack thru the wind? apply penalty */ bool tacked = false; @@ -29,7 +29,7 @@ $NetBSD: patch-src_RouteMap.cpp,v 1.1 2016/06/16 16:03:55 bouyer Exp $ tacked = true; dt += configuration.TackingTime; #if 0 -@@ -2101,7 +2101,7 @@ +@@ -2098,7 +2098,7 @@ #endif } |