sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Patch to disallow placement if segment_length=0 from jonb (fixes #86)

Browse source
This commit is contained in:
Dominic Hargreaves 2008-03-29 20:02:16 +00:00
parent 6e360f0090
commit e128d51534
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/placement_finder.cpp
View file

@ -561,6 +561,10 @@ namespace mapnik
double dy = new_y - old_y;
double segment_length = path_distances[index];
if (segment_length == 0) {
// Not allowed to place across on 0 length segments or discontinuities
return std::auto_ptr<placement_element>(NULL);
}
current_placement->starting_x = old_x + dx*distance/segment_length;
current_placement->starting_y = old_y + dy*distance/segment_length;
@ -584,6 +588,10 @@ namespace mapnik
c = ci.character;
//Coordinates this character will start at
if (segment_length == 0) {
// Not allowed to place across on 0 length segments or discontinuities
return std::auto_ptr<placement_element>(NULL);
}
double start_x = old_x + dx*distance/segment_length;
double start_y = old_y + dy*distance/segment_length;
//Coordinates this character ends at, calculated below