Selaa lähdekoodia

Merge pull request #767 from commontk/support-cpp98

COMP: ctkVTK[..]Transfer[...]: Support C++98 using CTK_NULLPTR
Jean-Christophe Fillion-Robin 7 vuotta sitten
vanhempi
commit
695495c880

+ 0 - 1
Libs/Visualization/VTK/Core/vtkDiscretizableColorTransferChart.cpp

@@ -20,7 +20,6 @@
 #include "vtkDiscretizableColorTransferChart.h"
 
 #include "ctkVTKScalarsToColorsUtils.h"
-#include "ctkCompilerDetections_p.h" // For CTK_NULLPTR
 #include "vtkDiscretizableColorTransferControlPointsItem.h"
 
 #include <vtkAxis.h>

+ 1 - 1
Libs/Visualization/VTK/Core/vtkScalarsToColorsContextItem.cpp

@@ -234,7 +234,7 @@ double* vtkScalarsToColorsContextItem::GetLimitRange()
 // ----------------------------------------------------------------------------
 void vtkScalarsToColorsContextItem::RecalculateChartsRange()
 {
-  if (this->GetDiscretizableColorTransferFunction() == nullptr)
+  if (this->GetDiscretizableColorTransferFunction() == CTK_NULLPTR)
   {
     return;
   }

+ 1 - 1
Libs/Visualization/VTK/Widgets/ctkVTKDiscretizableColorTransferWidget.cpp

@@ -435,7 +435,7 @@ void ctkVTKDiscretizableColorTransferWidget::setHistogram(
 
   d->scalarsToColorsContextItem->SetDataRange(d->dataRange[0], d->dataRange[1]);
 
-  if (this->discretizableColorTransferFunction() == nullptr)
+  if (this->discretizableColorTransferFunction() == CTK_NULLPTR)
   {
     return;
   }