Merge pull request #1291 from danieldresser-ie/fontError

IECoreScene::Font : Replace invalid chars with X instead of crashing

Author: johnhaddon

src/IECoreScene/Font.cpp

@@ -522,6 +522,11 @@ class Font::Implementation : public IECore::RefCounted
 
 		const Mesh *cachedMesh( char c ) const
 		{
+			if( c < 0 )
+			{
+				// Map all invalid characters to capital X
+				c = 'X';
+			}
 			FreeTypeMutex::scoped_lock lock( g_freeTypeMutex );
 
 			// see if we have it cached

test/IECoreScene/FontTest.py

@@ -107,5 +107,12 @@ def testLineSpacing( self ) :
 
 		self.assertGreater( font.bound( "T\nT" ).size().y, font.bound( "TT" ).size().y )
 
+	def testInvalidChar( self ) :
+
+		font = IECoreScene.Font( os.path.join( "test", "IECore", "data", "fonts", "Vera.ttf" ) )
+
+		self.assertEqual( font.bound( "X" ), font.bound( b"\xff" ) )
+		self.assertEqual( font.mesh( "X" ), font.mesh( b"\xff" ) )
+
 if __name__ == "__main__":
     unittest.main()