Skip to content

Commit

Permalink
Merge branch 'branch-6-4' into branch-7-0
Browse files Browse the repository at this point in the history
  • Loading branch information
tbonfort committed Feb 23, 2016
2 parents ab96f8a + 078a6a3 commit 5c2411e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mapprimitive.c
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,7 @@ int msPolygonLabelPoint(shapeObj *p, pointObj *lp, double min_dimension)
if(len > max_len) {
max_len = len;
lp->x = (intersect[i] + intersect[i+1])/2;
/* lp->y = y; */
lp->y = y;
}
}
} else { /* center vertically, fix x */
Expand Down Expand Up @@ -1518,7 +1518,7 @@ int msPolygonLabelPoint(shapeObj *p, pointObj *lp, double min_dimension)
if(len > max_len) {
max_len = len;
lp->y = (intersect[i] + intersect[i+1])/2;
/* lp->x = x; */
lp->x = x;
}
}
}
Expand Down

0 comments on commit 5c2411e

Please sign in to comment.