diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:38 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:38 +0100 |
| commit | d0ca838c7ab297036b4a7c45351761a48fe05efd (patch) | |
| tree | f0f3cc006e8157d6bd699bd644b7dd7b35387ac2 /app/bin/shrtpath.c | |
| parent | fd6639655b399a79fb72f494786a4f57da9c90e7 (diff) | |
| parent | 5d2c2b27a6323e2666378b986129b2a7c2c39e5c (diff) | |
Update upstream source from tag 'upstream/5.2.2GA'
Update to upstream version '5.2.2GA'
with Debian dir 9c80045d0b4f9e463647bc8af8c090a673df4132
Diffstat (limited to 'app/bin/shrtpath.c')
| -rw-r--r-- | app/bin/shrtpath.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/bin/shrtpath.c b/app/bin/shrtpath.c index b8fbe1e..da60d0f 100644 --- a/app/bin/shrtpath.c +++ b/app/bin/shrtpath.c @@ -20,8 +20,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <string.h> - #include "shrtpath.h" #include "track.h" @@ -153,7 +151,7 @@ LOG( log_shortPath, 2, ( " AddPath( T%d:%d.%d D=%0.3f B%d ) -> \n", GetTrkIndex while (1) { if ( ep2>=0 ) { AddTrackToNode( trk, ep1, ep2, dist ); - dist += GetTrkLength( trk, ep1, -1 ) + GetTrkLength( trk, ep2, -1 ); + dist += GetTrkLength( trk, ep1, ep2 ); if ( DoShortPathFunc( func, "MATCH", SPTC_MATCH, trk, ep2, ep1, dist, data ) ) { trk = NULL; ep1 = -1; @@ -237,7 +235,6 @@ int FindShortestPath( pathNode_p pNext; int pinx=0; DIST_T minDist; - int count; int rc = 0; EPINX_T ep2, epCnt, ep3; static dynArr_t ep_da; @@ -245,7 +242,6 @@ int FindShortestPath( DYNARR_RESET( pathNode_t, pathNode_da ); DYNARR_RESET( trackep_t, trackep_da ); - count = 0; if ( !log_shortPathInitted ) { log_shortPath = LogFindIndex( "shortPath" ); @@ -265,8 +261,6 @@ LOG( log_shortPath, 1, ( "FindShortestPath( T%d:%d, %s, ... )\n", GetTrkIndex(tr AddPath( -1, shortPathTrk1, shortPathEP1, -1, 0.0, func, data ); while (1) { - InfoMessage( "%d", ++count ); - /* select next final node */ minDist = 0.0; inxCurr = -1; |