fix failing SetGet test forvtkHeatmapItem

Change-Id: Ibd1956b5e76f47e39f08fd787f57e0688312f6fd
Merge topic 'fix_heatmap_setget' into master

bba6de82 fix failing SetGet test forvtkHeatmapItem
Assume UTF8 for vtkCarbonRenderWindow::SetWindowName

Since VTK now uses UTF8 in other places, use it here too instead
of ASCII.  This is backwards compatible.

Change-Id: I32dc7174e1460f27c8e73e6fb6b8982f2d35d0b7
Merge topic 'carbon-utf8' into master

5a568d2c Assume UTF8 for vtkCarbonRenderWindow::SetWindowName
Remove unnessary 'if' before 'delete[]'

This fixes, in a roundabout way, a -Windent warning about the
next line being indented too much.  It's still indented too
much but without the 'if' on the previous line, -Windent won't care.

Change-Id: I2ae9bbe230f314bdbd0a57285215ff40c15f45e8
Merge topic 'Windent-unneeded-if' into master

ad14e44c Remove unnessary 'if' before 'delete[]'