Merge topic 'random_mask_points_2' into pv-master

0ecabb4a Fix debug leak of DummyController.

Parallel/vtkPMaskPoints.cxx

@@ -16,7 +16,6 @@
 
 #include "vtkObjectFactory.h"
 #include "vtkMultiProcessController.h"
-#include "vtkSmartPointer.h"
 #include "vtkDummyController.h"
 
 vtkStandardNewMacro(vtkPMaskPoints);
@@ -28,10 +27,16 @@ vtkPMaskPoints::vtkPMaskPoints()
   this->SetController(vtkMultiProcessController::GetGlobalController());
   if(!this->Controller)
     {
-      this->SetController(vtkSmartPointer<vtkDummyController>::New());
+      this->SetController(vtkDummyController::New());
     }
 }
 
+vtkPMaskPoints::~vtkPMaskPoints()
+{
+  this->Controller->Delete();
+  this->SetController(NULL);
+}
+
 //----------------------------------------------------------------------------
 void vtkPMaskPoints::PrintSelf(ostream& os, vtkIndent indent)
 {

Parallel/vtkPMaskPoints.h

@@ -39,7 +39,7 @@ public:
 
 protected:
   vtkPMaskPoints();
-  ~vtkPMaskPoints() {};
+  ~vtkPMaskPoints();
 
   virtual void InternalScatter(unsigned long*, unsigned long *, int, int);
   virtual void InternalGather(unsigned long*, unsigned long*, int, int);