From: <te...@us...> - 2011-02-20 21:25:51
|
Revision: 4228 http://navit.svn.sourceforge.net/navit/?rev=4228&view=rev Author: tegzed Date: 2011-02-20 21:25:44 +0000 (Sun, 20 Feb 2011) Log Message: ----------- Fix:osd/core:speedcam osd displays distance to OSM based cameras Modified Paths: -------------- trunk/navit/navit/osd/core/osd_core.c Modified: trunk/navit/navit/osd/core/osd_core.c =================================================================== --- trunk/navit/navit/osd/core/osd_core.c 2011-02-20 20:38:06 UTC (rev 4227) +++ trunk/navit/navit/osd/core/osd_core.c 2011-02-20 21:25:44 UTC (rev 4228) @@ -1514,7 +1514,7 @@ this_->announce_state=eNoWarn; } - if(this_->text && 0<=idx ) { + if(this_->text) { char buffer [256]=""; char buffer2[256]=""; char dir_str[16]; @@ -1525,7 +1525,7 @@ osd_std_draw(&this_->item); str_replace(buffer,this_->text,"${distance}",format_distance(dCurrDist,"",imperial)); - str_replace(buffer2,buffer,"${camera_type}",(idx<=CAM_TRAFFIPAX)?camera_t_strs[idx]:""); + str_replace(buffer2,buffer,"${camera_type}",(0<=idx && idx<=CAM_TRAFFIPAX)?camera_t_strs[idx]:""); str_replace(buffer,buffer2,"${camera_dir}",(0<=dir_idx && dir_idx<=CAMDIR_TWO)?camdir_t_strs[dir_idx]:""); sprintf(dir_str,"%d",dir); sprintf(spd_str,"%d",spd); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |