Fix multiple overlaps of curved labels (fix #12792)

nyalldawson · nyalldawson · commit 1f14ce704ee3 · 2015-05-21T18:03:21.000+10:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -4377,7 +4377,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
`@@ -4377,7 +4377,7 @@ void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext& con`
`4377`	`4377`	`}`
`4378`	`4378`
`4379`	`4379`	`//QgsDebugMsgLevel( "drawLabel " + txt, 4 );`
`4380`		`- QStringList multiLineList = QgsPalLabeling::splitToLines( text, tmpLyr.wrapChar );`
	`4380`	`+ QStringList multiLineList = QgsPalLabeling::splitToLines( txt, tmpLyr.wrapChar );`
`4381`	`4381`	`int lines = multiLineList.size();`
`4382`	`4382`
`4383`	`4383`	`double labelWidest = 0.0;`