qgis · Jul 20, 2016
diff --git a/‎src/core/pal/feature.cpp
Lines changed: 3 additions & 10 deletions b/‎src/core/pal/feature.cpp
Lines changed: 3 additions & 10 deletions
diff --git a/‎tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size.png
-1.28 KB b/‎tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size.png
-1.28 KB
diff --git a/‎tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size_mask.png
-17.1 KB b/‎tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size_mask.png
-17.1 KB
diff --git a/‎tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic.png
-393 Bytes b/‎tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic.png
-393 Bytes
diff --git a/‎tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic_mask.png
20.7 KB b/‎tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic_mask.png
20.7 KB
diff --git a/‎tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased.png
-2.17 KB b/‎tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased.png
-2.17 KB
diff --git a/‎tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased_mask.png
21.6 KB b/‎tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased_mask.png
21.6 KB
@@ -879,13 +879,6 @@ LabelPosition* FeaturePart::curvedPlacementAtOffset( PointSet* path_positions, d
       delete slp;
       return nullptr;
     }
-    // Shift the character downwards since the draw position is specified at the baseline
-    // and we're calculating the mean line here
-    double dist = 0.9 * li->label_height / 2;
-    if ( orientation < 0 )
-      dist = -dist;
-    start_x += dist * cos( angle + M_PI_2 );
-    start_y -= dist * sin( angle + M_PI_2 );
 
     double render_angle = angle;
 
@@ -1049,11 +1042,11 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition* >& lPos,
       double angle_avg = atan2( sin_avg / li->char_num, cos_avg / li->char_num );
       // displacement
       if (( !reversed && ( flags & FLAG_ABOVE_LINE ) ) || ( reversed && ( flags & FLAG_BELOW_LINE ) ) )
-        positions.append( _createCurvedCandidate( slp, angle_avg, mLF->distLabel() + li->label_height / 2 ) );
+        positions.append( _createCurvedCandidate( slp, angle_avg, mLF->distLabel() ) );
       if ( flags & FLAG_ON_LINE )
-        positions.append( _createCurvedCandidate( slp, angle_avg, 0 ) );
+        positions.append( _createCurvedCandidate( slp, angle_avg, -li->label_height / 2 ) );
       if (( !reversed && ( flags & FLAG_BELOW_LINE ) ) || ( reversed && ( flags & FLAG_ABOVE_LINE ) ) )
-        positions.append( _createCurvedCandidate( slp, angle_avg, -li->label_height / 2 - mLF->distLabel() ) );
+        positions.append( _createCurvedCandidate( slp, angle_avg, -li->label_height - mLF->distLabel() ) );
 
       // delete original candidate
       delete slp;