IECoreGL::TextPrimitive : Fix warning C4701

ericmehl · ericmehl · commit b2ffab0be45e · 2022-07-06T18:45:27.000-04:00
- Rename second `b` variable and expand bound calculation in loop.
diff --git a/src/IECoreGL/TextPrimitive.cpp b/src/IECoreGL/TextPrimitive.cpp
@@ -62,9 +62,10 @@ TextPrimitive::TextPrimitive( const std::string &text, FontPtr font )
 		V2f advanceSum( 0 );
 		for( unsigned i=0; i<m_text.size(); i++ )
 		{
-			Box2f b = m_font->coreFont()->bound( m_text[i] );
-			b.min += advanceSum;
-			b.max += advanceSum;
+			Box2f characterB = m_font->coreFont()->bound( m_text[i] );
+			characterB.min += advanceSum;
+			characterB.max += advanceSum;
+			b.extendBy( characterB );
 			if( i<m_text.size() - 1 )
 			{
 				V2f a = m_font->coreFont()->advance( m_text[i], m_text[i+1] );

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,10 @@ TextPrimitive::TextPrimitive( const std::string &text, FontPtr font )`
`62`	`62`	`V2f advanceSum( 0 );`
`63`	`63`	`for( unsigned i=0; i<m_text.size(); i++ )`
`64`	`64`	`{`
`65`		`- Box2f b = m_font->coreFont()->bound( m_text[i] );`
`66`		`- b.min += advanceSum;`
`67`		`- b.max += advanceSum;`
	`65`	`+ Box2f characterB = m_font->coreFont()->bound( m_text[i] );`
	`66`	`+ characterB.min += advanceSum;`
	`67`	`+ characterB.max += advanceSum;`
	`68`	`+ b.extendBy( characterB );`
`68`	`69`	`if( i<m_text.size() - 1 )`
`69`	`70`	`{`
`70`	`71`	`V2f a = m_font->coreFont()->advance( m_text[i], m_text[i+1] );`