r21603 by jghali - #14424: glyphs displayed with incorrect colors after CTL merge

[scribus-commit]

Author: jghali
Date: Wed Dec  7 01:19:39 2016
New Revision: 21603

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21603
Log:
#14424: glyphs displayed with incorrect colors after CTL merge

Modified:
    trunk/Scribus/scribus/text/boxes.cpp

Modified: trunk/Scribus/scribus/text/boxes.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21603&path=/trunk/Scribus/scribus/text/boxes.cpp
==============================================================================
--- trunk/Scribus/scribus/text/boxes.cpp	(original)
+++ trunk/Scribus/scribus/text/boxes.cpp	Wed Dec  7 01:19:39 2016
@@ -621,7 +621,7 @@
 			st += fontSize * m_glyphRun.scaleV() * (charStyle.baselineOffset() / 1000.0);
 
 		double sw = p->strokeWidth();
-		const TextLayoutColor& sc = p->strokeColor();
+		TextLayoutColor sc = p->strokeColor();
 
 		p->setStrokeColor(p->fillColor());
 		p->setStrokeWidth(lw);
@@ -651,7 +651,7 @@
 			double yoff = (charStyle.fontSize() * m_glyphRun.scaleV() * charStyle.shadowYOffset() / 10000.0);
 
 			bool s = p->selected();
-			const TextLayoutColor& fc = p->fillColor();
+			TextLayoutColor fc = p->fillColor();
 
 			p->translate(xoff, -yoff);
 
@@ -696,7 +696,7 @@
 			st += fontSize * m_glyphRun.scaleV() * (charStyle.baselineOffset() / 1000.0);
 
 		double sw = p->strokeWidth();
-		const TextLayoutColor& sc = p->strokeColor();
+		TextLayoutColor sc = p->strokeColor();
 
 		p->setStrokeColor(p->fillColor());
 		p->setStrokeWidth(lw);