ソースを参照

Fix memory leaks in ctkVTKHistogramTest tests

Jean-Christophe Fillion-Robin 13 年 前
コミット
7c05b96acc

+ 4 - 3
Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKHistogramTest1.cpp

@@ -65,7 +65,8 @@ int ctkVTKHistogramTest1( int argc, char * argv [])
 
   //------Test setDataArray--------------------------
   int dataType = VTK_CHAR;
-  vtkSmartPointer<vtkDataArray> newDataArray = vtkDataArray::CreateDataArray(dataType);
+  vtkSmartPointer<vtkDataArray> newDataArray;
+  newDataArray.TakeReference(vtkDataArray::CreateDataArray(dataType));
   defaultHistogram.setDataArray(newDataArray);
   if (defaultHistogram.dataArray() != newDataArray)
     {
@@ -79,7 +80,7 @@ int ctkVTKHistogramTest1( int argc, char * argv [])
   defaultHistogram.build();
 
   dataType = VTK_INT;
-  newDataArray = vtkDataArray::CreateDataArray(dataType);
+  newDataArray.TakeReference(vtkDataArray::CreateDataArray(dataType));
   newDataArray->SetNumberOfComponents(1);
   newDataArray->InsertNextTuple1(50);
   newDataArray->InsertNextTuple1(143);
@@ -98,7 +99,7 @@ int ctkVTKHistogramTest1( int argc, char * argv [])
   defaultHistogram.build();
 
   dataType = VTK_FLOAT;
-  newDataArray = vtkDataArray::CreateDataArray(dataType);
+  newDataArray.TakeReference(vtkDataArray::CreateDataArray(dataType));
   defaultHistogram.setDataArray(newDataArray);
   if (defaultHistogram.dataArray() != newDataArray)
     {

+ 2 - 1
Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKHistogramTest2.cpp

@@ -25,7 +25,8 @@ int ctkVTKHistogramTest2( int argc, char * argv [])
   //------Test build--------------------------------
   ctkVTKHistogram rgbHistogram;
 
-  vtkSmartPointer<vtkDataArray> rgbDataArray = vtkDataArray::CreateDataArray(VTK_INT);
+  vtkSmartPointer<vtkDataArray> rgbDataArray;
+  rgbDataArray.TakeReference(vtkDataArray::CreateDataArray(VTK_INT));
   rgbDataArray->SetNumberOfComponents(3);
   rgbDataArray->InsertNextTuple3(   0,  50,     0);
   rgbDataArray->InsertNextTuple3(1000, 143, -1412);

+ 2 - 1
Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKHistogramTest3.cpp

@@ -25,7 +25,8 @@ int ctkVTKHistogramTest3( int argc, char * argv [])
   //------Test build--------------------------------
   ctkVTKHistogram histogram;
 
-  vtkSmartPointer<vtkDataArray> dataArray = vtkDataArray::CreateDataArray(VTK_CHAR);
+  vtkSmartPointer<vtkDataArray> dataArray;
+  dataArray.TakeReference(vtkDataArray::CreateDataArray(VTK_CHAR));
   dataArray->InsertNextTuple1(0);
   dataArray->InsertNextTuple1(0);
   dataArray->InsertNextTuple1(0);

+ 2 - 1
Libs/Visualization/VTK/Core/Testing/Cpp/ctkVTKHistogramTest4.cpp

@@ -26,7 +26,8 @@ int ctkVTKHistogramTest4( int argc, char * argv [])
   //------Test build--------------------------------
   ctkVTKHistogram histogram;
 
-  vtkSmartPointer<vtkDataArray> dataArray = vtkDataArray::CreateDataArray(VTK_FLOAT);
+  vtkSmartPointer<vtkDataArray> dataArray;
+  dataArray.TakeReference(vtkDataArray::CreateDataArray(VTK_FLOAT));
   dataArray->InsertNextTuple1( 10.001);
   dataArray->InsertNextTuple1( -0.231);
   dataArray->InsertNextTuple1( 220.0001);