Handle case when textDims are NULL

msmolens · msmolens · commit bd63a80ef8d6 · 2016-04-27T09:42:18.000-04:00
Add a NULL pointer check to handle the case when textDims are not provided in vtkFreeTypeTools::RenderStringInternal(). This fixes a regression introduced in commit 5dcad97.
diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx
@@ -1242,8 +1242,11 @@ bool vtkFreeTypeTools::RenderStringInternal(vtkTextProperty *tprop,
   if (str.empty())
     {
     data->Initialize();
-    textDims[0] = 0;
-    textDims[1] = 0;
+    if (textDims)
+      {
+      textDims[0] = 0;
+      textDims[1] = 0;
+      }
     return true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1242,8 +1242,11 @@ bool vtkFreeTypeTools::RenderStringInternal(vtkTextProperty *tprop,`
`1242`	`1242`	`if (str.empty())`
`1243`	`1243`	`{`
`1244`	`1244`	`data->Initialize();`
`1245`		`- textDims[0] = 0;`
`1246`		`- textDims[1] = 0;`
	`1245`	`+ if (textDims)`
	`1246`	`+ {`
	`1247`	`+ textDims[0] = 0;`
	`1248`	`+ textDims[1] = 0;`
	`1249`	`+ }`
`1247`	`1250`	`return true;`
`1248`	`1251`	`}`
`1249`	`1252`