Commit b0a5888b authored by Dave Partyka's avatar Dave Partyka Committed by Kitware Robot
Browse files

Merge topic 'volumrendering-printself'

f5b6fe05 Fix failing printself/otherprint tests.
parents fe109386 f5b6fe05
......@@ -920,8 +920,12 @@ int vtkVolumeRayCastSpaceLeapingImageFilter
{
// the number of independent components for which we need to keep track of
// min/max
const int components = this->CurrentScalars->GetNumberOfComponents();
return ((this->IndependentComponents) ? components : 1);
if(this->CurrentScalars)
{
const int components = this->CurrentScalars->GetNumberOfComponents();
return ((this->IndependentComponents) ? components : 1);
}
return 0;
}
//----------------------------------------------------------------------------
......@@ -931,8 +935,7 @@ void vtkVolumeRayCastSpaceLeapingImageFilter
// Find the first non-zero scalar opacity and gradient opacity points on
// the respective transfer functions
const unsigned int nComponents = static_cast< unsigned int >(
this->GetNumberOfIndependentComponents());
const int nComponents = this->GetNumberOfIndependentComponents();
// Initialize these arrays.
if (this->MinNonZeroScalarIndex)
......@@ -949,7 +952,7 @@ void vtkVolumeRayCastSpaceLeapingImageFilter
// Update the flags now
int i;
this->MinNonZeroScalarIndex = new unsigned short [nComponents];
for ( unsigned int c = 0; c < nComponents; c++ )
for ( int c = 0; c < nComponents; c++ )
{
for ( i = 0; i < this->TableSize[c]; i++ )
{
......@@ -962,7 +965,7 @@ void vtkVolumeRayCastSpaceLeapingImageFilter
}
this->MinNonZeroGradientMagnitudeIndex = new unsigned char [nComponents];
for ( unsigned int c = 0; c < nComponents; c++ )
for ( int c = 0; c < nComponents; c++ )
{
for ( i = 0; i < 256; i++ )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment