Fix multiple overlaps of curved labels (fix #12792)

nyalldawson · nyalldawson · commit 7d97ab50fcda · 2015-05-21T18:01:45.000+10:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -4504,7 +4504,7 @@ void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext& con
     }
 
     //QgsDebugMsgLevel( "drawLabel " + txt, 4 );
-    QStringList multiLineList = QgsPalLabeling::splitToLines( text, tmpLyr.wrapChar );
+    QStringList multiLineList = QgsPalLabeling::splitToLines( txt, tmpLyr.wrapChar );
     int lines = multiLineList.size();
 
     double labelWidest = 0.0;

Original file line number	Diff line number	Diff line change
`@@ -4504,7 +4504,7 @@ void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext& con`
`4504`	`4504`	`}`
`4505`	`4505`
`4506`	`4506`	`//QgsDebugMsgLevel( "drawLabel " + txt, 4 );`
`4507`		`- QStringList multiLineList = QgsPalLabeling::splitToLines( text, tmpLyr.wrapChar );`
	`4507`	`+ QStringList multiLineList = QgsPalLabeling::splitToLines( txt, tmpLyr.wrapChar );`
`4508`	`4508`	`int lines = multiLineList.size();`
`4509`	`4509`
`4510`	`4510`	`double labelWidest = 0.0;`