Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix warnings
  • Loading branch information
nyalldawson committed Dec 3, 2019
1 parent 316fd50 commit 2346027
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/core/pal/costcalculator.cpp
Expand Up @@ -66,15 +66,15 @@ void CostCalculator::addObstacleCostPenalty( LabelPosition *lp, FeaturePart *obs
// behavior depends on obstacle avoid type
switch ( obstacle->layer()->obstacleType() )
{
case QgsPalLayerSettings::PolygonInterior:
case QgsLabelObstacleSettings::PolygonInterior:
// n ranges from 0 -> 12
n = lp->polygonIntersectionCost( obstacle );
break;
case QgsPalLayerSettings::PolygonBoundary:
case QgsLabelObstacleSettings::PolygonBoundary:
// penalty may need tweaking, given that interior mode ranges up to 12
n = ( lp->crossesBoundary( obstacle ) ? 6 : 0 );
break;
case QgsPalLayerSettings::PolygonWhole:
case QgsLabelObstacleSettings::PolygonWhole:
// n is either 0 or 12
n = ( lp->intersectsWithPolygon( obstacle ) ? 12 : 0 );
break;
Expand Down

0 comments on commit 2346027

Please sign in to comment.