diff --git a/examples/hello_world/HelloWorld.cxx b/examples/hello_world/HelloWorld.cxx index 67f4c1dc9..092d0c396 100644 --- a/examples/hello_world/HelloWorld.cxx +++ b/examples/hello_world/HelloWorld.cxx @@ -180,7 +180,7 @@ struct HelloVTKMInterop //global static so that glut callback can access it typedef VTKM_DEFAULT_DEVICE_ADAPTER_TAG DeviceAdapter; -HelloVTKMInterop< DeviceAdapter, vtkm::Float32 >* helloWorld = NULL; +HelloVTKMInterop< DeviceAdapter, vtkm::Float32 >* helloWorld = nullptr; // Render the output using simple OpenGL void run() diff --git a/examples/rendering/Rendering.cxx b/examples/rendering/Rendering.cxx index e9fdfff92..6d1545631 100644 --- a/examples/rendering/Rendering.cxx +++ b/examples/rendering/Rendering.cxx @@ -45,7 +45,7 @@ #include #include -vtkm::rendering::View3D *view = NULL; +vtkm::rendering::View3D *view = nullptr; const vtkm::Int32 W = 512, H = 512; int buttonStates[3] = {GLUT_UP, GLUT_UP, GLUT_UP}; diff --git a/examples/streamline/StreamLineUniformGrid.cxx b/examples/streamline/StreamLineUniformGrid.cxx index c916950f4..57a1f8e29 100755 --- a/examples/streamline/StreamLineUniformGrid.cxx +++ b/examples/streamline/StreamLineUniformGrid.cxx @@ -237,7 +237,7 @@ int main(int argc, char* argv[]) // Read in the vector data for testing FILE * pFile = fopen(argv[1], "rb"); - if (pFile == NULL) perror ("Error opening file"); + if (pFile == nullptr) perror ("Error opening file"); size_t ret_code = 0; // Size of the dataset diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h index 8f4657318..4c40e5253 100644 --- a/vtkm/cont/ArrayHandle.h +++ b/vtkm/cont/ArrayHandle.h @@ -647,7 +647,7 @@ public: VTKM_CONT_EXPORT void PrepareForDevice(DeviceAdapterTag) const { - if (this->Internals->ExecutionArray != NULL) + if (this->Internals->ExecutionArray != nullptr) { if (this->Internals->ExecutionArray->IsDeviceAdapter(DeviceAdapterTag())) { @@ -672,7 +672,7 @@ public: } } - VTKM_ASSERT(this->Internals->ExecutionArray == NULL); + VTKM_ASSERT(this->Internals->ExecutionArray == nullptr); VTKM_ASSERT(!this->Internals->ExecutionArrayValid); // Need to change some state that does not change the logical state from // an external point of view. diff --git a/vtkm/cont/DeviceAdapterAlgorithm.h b/vtkm/cont/DeviceAdapterAlgorithm.h index 03a9f5c96..b432ff72f 100644 --- a/vtkm/cont/DeviceAdapterAlgorithm.h +++ b/vtkm/cont/DeviceAdapterAlgorithm.h @@ -513,7 +513,7 @@ public: retval.Microseconds = 1000*currentTime.millitm; #else timeval currentTime; - gettimeofday(¤tTime, NULL); + gettimeofday(¤tTime, nullptr); retval.Seconds = currentTime.tv_sec; retval.Microseconds = currentTime.tv_usec; #endif diff --git a/vtkm/cont/DynamicArrayHandle.h b/vtkm/cont/DynamicArrayHandle.h index ff05185ae..9e09fe448 100644 --- a/vtkm/cont/DynamicArrayHandle.h +++ b/vtkm/cont/DynamicArrayHandle.h @@ -123,7 +123,7 @@ struct DynamicArrayHandleCopyHelper { // A simple function to downcast an ArrayHandle encapsulated in a // PolymorphicArrayHandleContainerBase to the given type of ArrayHandle. If the -// conversion cannot be done, NULL is returned. +// conversion cannot be done, nullptr is returned. template VTKM_CONT_EXPORT vtkm::cont::ArrayHandle * @@ -134,13 +134,13 @@ DynamicArrayHandleTryCast( downcastContainer = dynamic_cast< vtkm::cont::detail::PolymorphicArrayHandleContainer *>( arrayContainer); - if (downcastContainer != NULL) + if (downcastContainer != nullptr) { return &downcastContainer->Array; } else { - return NULL; + return nullptr; } } @@ -234,7 +234,7 @@ public: bool IsTypeAndStorage() const { return ( detail::DynamicArrayHandleTryCast(this->ArrayContainer) - != NULL); + != nullptr); } /// Returns true if this array matches the array handle type passed in. @@ -271,7 +271,7 @@ public: CastToTypeStorage() const { vtkm::cont::ArrayHandle *downcastArray = detail::DynamicArrayHandleTryCast(this->ArrayContainer); - if (downcastArray == NULL) + if (downcastArray == nullptr) { throw vtkm::cont::ErrorControlBadType("Bad cast of dynamic array."); } diff --git a/vtkm/cont/DynamicCellSet.h b/vtkm/cont/DynamicCellSet.h index c739d7497..f4610f58f 100644 --- a/vtkm/cont/DynamicCellSet.h +++ b/vtkm/cont/DynamicCellSet.h @@ -58,7 +58,7 @@ struct DynamicCellSetCopyHelper { // A simple function to downcast a CellSet encapsulated in a // SimplePolymorphicContainerBase to the given subclass of CellSet. If the -// conversion cannot be done, NULL is returned. +// conversion cannot be done, nullptr is returned. template VTKM_CONT_EXPORT CellSetType * @@ -69,13 +69,13 @@ DynamicCellSetTryCast( downcastContainer = dynamic_cast< vtkm::cont::internal::SimplePolymorphicContainer *>( cellSetContainer); - if (downcastContainer != NULL) + if (downcastContainer != nullptr) { return &downcastContainer->Item; } else { - return NULL; + return nullptr; } } @@ -166,7 +166,7 @@ public: VTKM_CONT_EXPORT bool IsType() const { return (detail::DynamicCellSetTryCast(this->CellSetContainer) - != NULL); + != nullptr); } /// Returns true if this cell set is the same (or equivalent) type as the @@ -195,7 +195,7 @@ public: CellSetType &Cast() const { CellSetType *cellSetPointer = detail::DynamicCellSetTryCast(this->CellSetContainer); - if (cellSetPointer == NULL) + if (cellSetPointer == nullptr) { throw vtkm::cont::ErrorControlBadType("Bad cast of dynamic cell set."); } @@ -323,7 +323,7 @@ struct DynamicCellSetTryCellSet { CellSetType *cellSet = detail::DynamicCellSetTryCast(this->CellSetContainer); - if (cellSet != NULL) + if (cellSet != nullptr) { this->Function(*cellSet); this->FoundCast = true; diff --git a/vtkm/cont/StorageBasic.h b/vtkm/cont/StorageBasic.h index c06cf3e42..c08f3c0fd 100755 --- a/vtkm/cont/StorageBasic.h +++ b/vtkm/cont/StorageBasic.h @@ -61,9 +61,9 @@ namespace internal { inline void* alloc_aligned(size_t size, size_t align){ #if defined(VTKM_MEMALIGN_POSIX) - void *mem = NULL; + void *mem = nullptr; if (posix_memalign(&mem, align, size) != 0){ - mem = NULL; + mem = nullptr; } #elif defined(VTKM_MEMALIGN_WIN) void *mem = _aligned_malloc(size, align); @@ -72,7 +72,7 @@ inline void* alloc_aligned(size_t size, size_t align){ #else void *mem = malloc(size); #endif - if (mem == NULL){ + if (mem == nullptr){ throw std::bad_alloc(); } return mem; @@ -174,12 +174,12 @@ public: public: VTKM_CONT_EXPORT - Storage(const ValueType *array = NULL, vtkm::Id numberOfValues = 0) + Storage(const ValueType *array = nullptr, vtkm::Id numberOfValues = 0) : Array(const_cast(array)), NumberOfValues(numberOfValues), AllocatedSize(numberOfValues), DeallocateOnRelease(false), - UserProvidedMemory( array == NULL ? false : true) + UserProvidedMemory( array == nullptr ? false : true) { } @@ -230,20 +230,20 @@ public: { if (this->NumberOfValues > 0) { - VTKM_ASSERT(this->Array != NULL); + VTKM_ASSERT(this->Array != nullptr); if (this->DeallocateOnRelease) { AllocatorType allocator; allocator.deallocate(this->Array, static_cast(this->AllocatedSize) ); } - this->Array = NULL; + this->Array = nullptr; this->NumberOfValues = 0; this->AllocatedSize = 0; } else { - VTKM_ASSERT(this->Array == NULL); + VTKM_ASSERT(this->Array == nullptr); } } @@ -281,7 +281,7 @@ public: catch (std::bad_alloc err) { // Make sureour state is OK. - this->Array = NULL; + this->Array = nullptr; this->NumberOfValues = 0; this->AllocatedSize = 0; throw vtkm::cont::ErrorControlBadAllocation( @@ -342,7 +342,7 @@ public: /// \brief Take the reference away from this object. /// /// This method returns the pointer to the array held by this array. It then - /// clears the internal array pointer to NULL, thereby ensuring that the + /// clears the internal array pointer to nullptr, thereby ensuring that the /// Storage will never deallocate the array. This is helpful for taking a /// reference for an array created internally by VTK-m and not having to keep /// a VTK-m object around. Obviously the caller becomes responsible for @@ -352,7 +352,7 @@ public: ValueType *StealArray() { ValueType *saveArray = this->Array; - this->Array = NULL; + this->Array = nullptr; this->NumberOfValues = 0; this->AllocatedSize = 0; return saveArray; diff --git a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h index 9f8ca73c6..812440bbd 100644 --- a/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h +++ b/vtkm/cont/cuda/internal/DeviceAdapterAlgorithmThrust.h @@ -1034,8 +1034,8 @@ private: { const vtkm::Id ERROR_ARRAY_SIZE = 1024; static bool errorArrayInit = false; - static char* hostPtr = NULL; - static char* devicePtr = NULL; + static char* hostPtr = nullptr; + static char* devicePtr = nullptr; if( !errorArrayInit ) { cudaMallocHost( (void**)&hostPtr, ERROR_ARRAY_SIZE, cudaHostAllocMapped ); @@ -1097,7 +1097,7 @@ public: //since the memory is pinned we can access it safely on the host //without a memcpy vtkm::Id errorArraySize = 0; - char* hostErrorPtr = NULL; + char* hostErrorPtr = nullptr; char* deviceErrorPtr = GetPinnedErrorArray(errorArraySize, &hostErrorPtr); //clear the first character which means that we don't contain an error @@ -1156,7 +1156,7 @@ public: //since the memory is pinned we can access it safely on the host //without a memcpy vtkm::Id errorArraySize = 0; - char* hostErrorPtr = NULL; + char* hostErrorPtr = nullptr; char* deviceErrorPtr = GetPinnedErrorArray(errorArraySize, &hostErrorPtr); //clear the first character which means that we don't contain an error diff --git a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu index b6834897e..ef503dfca 100644 --- a/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu +++ b/vtkm/cont/cuda/testing/UnitTestCudaArrayHandle.cu @@ -37,12 +37,12 @@ void TestCudaHandle() { //Verify that we can construct a cuda array handle using the class inside //the vtkm::cont::cuda namespace - vtkm::cont::cuda::ArrayHandle handleFoo(NULL,0); + vtkm::cont::cuda::ArrayHandle handleFoo(nullptr,0); vtkm::cont::Field foo("foo", vtkm::cont::Field::ASSOC_CELL_SET , "cellset", handleFoo); //Verify that we can construct a cuda array handle using the class inside //the vtkm::cont namespace - vtkm::cont::ArrayHandleCuda< vtkm::Vec< vtkm::Float32, 3> > handleBar(NULL,0); + vtkm::cont::ArrayHandleCuda< vtkm::Vec< vtkm::Float32, 3> > handleBar(nullptr,0); vtkm::cont::Field bar("bar", vtkm::cont::Field::ASSOC_CELL_SET, "cellset", handleBar); } diff --git a/vtkm/cont/internal/ArrayPortalFromIterators.h b/vtkm/cont/internal/ArrayPortalFromIterators.h index 3cbd6d852..22beab389 100755 --- a/vtkm/cont/internal/ArrayPortalFromIterators.h +++ b/vtkm/cont/internal/ArrayPortalFromIterators.h @@ -261,7 +261,7 @@ public: std::advance(iterator, static_cast(this->NumberOfValues)); #else //Visual Studio checked iterators throw exceptions when you try to advance - //NULL iterators even if the advancement length is zero. So instead + //nullptr iterators even if the advancement length is zero. So instead //don't do the advancement at all if(this->NumberOfValues > 0) { diff --git a/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx b/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx index d8b3f82c6..2b38eaba1 100644 --- a/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx +++ b/vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx @@ -195,7 +195,7 @@ RectilinearTests() void TestDataSetBuilderRectilinear() { - vtkm::UInt32 seed = static_cast(time(NULL)); + vtkm::UInt32 seed = static_cast(time(nullptr)); std::cout << "Seed: " << seed << std::endl; g_RandomGenerator.seed(seed); diff --git a/vtkm/exec/testing/UnitTestParametricCoordinates.cxx b/vtkm/exec/testing/UnitTestParametricCoordinates.cxx index 41db6e0d2..e4c705335 100644 --- a/vtkm/exec/testing/UnitTestParametricCoordinates.cxx +++ b/vtkm/exec/testing/UnitTestParametricCoordinates.cxx @@ -287,7 +287,7 @@ struct TestPCoordsFunctor void TestAllPCoords() { - vtkm::UInt32 seed = static_cast(time(NULL)); + vtkm::UInt32 seed = static_cast(time(nullptr)); std::cout << "Seed: " << seed << std::endl; g_RandomGenerator.seed(seed); diff --git a/vtkm/interop/BufferState.h b/vtkm/interop/BufferState.h index b8b66e50f..49327889a 100644 --- a/vtkm/interop/BufferState.h +++ b/vtkm/interop/BufferState.h @@ -97,7 +97,7 @@ public: { //don't delete this as it points to user memory, or stack allocated //memory inside this object instance - this->OpenGLHandle = NULL; + this->OpenGLHandle = nullptr; } /// \brief get the OpenGL buffer handle diff --git a/vtkm/interop/cuda/internal/TransferToOpenGL.h b/vtkm/interop/cuda/internal/TransferToOpenGL.h index 1e99aab32..775cfb061 100644 --- a/vtkm/interop/cuda/internal/TransferToOpenGL.h +++ b/vtkm/interop/cuda/internal/TransferToOpenGL.h @@ -101,7 +101,7 @@ public: { //get the mapped pointer std::size_t cuda_size; - ValueType* pointer = NULL; + ValueType* pointer = nullptr; cudaError_t cError = cudaGraphicsResourceGetMappedPointer((void **)&pointer, &cuda_size, this->CudaResource); @@ -139,7 +139,7 @@ class TransferToOpenGL public: VTKM_CONT_EXPORT explicit TransferToOpenGL(BufferState& state): State(state), - Resource(NULL) + Resource(nullptr) { if( !this->State.HasType() ) { diff --git a/vtkm/io/reader/VTKDataSetReaderBase.h b/vtkm/io/reader/VTKDataSetReaderBase.h index 44ebfbac6..e0e08a7ba 100644 --- a/vtkm/io/reader/VTKDataSetReaderBase.h +++ b/vtkm/io/reader/VTKDataSetReaderBase.h @@ -378,7 +378,7 @@ protected: void TransferDataFile(VTKDataSetReaderBase &reader) { reader.DataFile.swap(this->DataFile); - this->DataFile.reset(NULL); + this->DataFile.reset(nullptr); } virtual void CloseFile() diff --git a/vtkm/rendering/CanvasEGL.h b/vtkm/rendering/CanvasEGL.h index ad0c424a0..2e01e0197 100644 --- a/vtkm/rendering/CanvasEGL.h +++ b/vtkm/rendering/CanvasEGL.h @@ -41,7 +41,7 @@ public: vtkm::Id height=1024) : CanvasGL(width,height) { - ctx = NULL; + ctx = nullptr; this->ResizeBuffers(width, height); } @@ -52,8 +52,8 @@ public: throw vtkm::cont::ErrorControlBadValue("Failed to get EGL display"); EGLint major, minor; if (!(eglInitialize(dpy, &major, &minor))) - throw vtkm::cont::ErrorControlBadValue("Failed to initialize EGL display"); - + throw vtkm::cont::ErrorControlBadValue("Failed to initialize EGL display"); + const EGLint cfgAttrs[] = { EGL_SURFACE_TYPE, EGL_PBUFFER_BIT, @@ -64,7 +64,7 @@ public: EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, EGL_NONE }; - + EGLint nCfgs; EGLConfig cfg; if (!(eglChooseConfig(dpy, cfgAttrs, &cfg, 1, &nCfgs)) || nCfgs == 0) @@ -76,7 +76,7 @@ public: EGL_HEIGHT, static_cast(this->GetHeight()), EGL_NONE, }; - + if (!(surf = eglCreatePbufferSurface(dpy, cfg, pbAttrs))) throw vtkm::cont::ErrorControlBadValue("Failed to create EGL PBuffer surface"); eglBindAPI(EGL_OPENGL_API); @@ -85,7 +85,7 @@ public: if (!(eglMakeCurrent(dpy, surf, surf, ctx))) throw vtkm::cont::ErrorControlBadValue("Failed to create EGL context current"); } - + VTKM_CONT_EXPORT virtual void Activate() { diff --git a/vtkm/rendering/CanvasOSMesa.h b/vtkm/rendering/CanvasOSMesa.h index 35a3bca91..12b44039a 100644 --- a/vtkm/rendering/CanvasOSMesa.h +++ b/vtkm/rendering/CanvasOSMesa.h @@ -41,7 +41,7 @@ public: vtkm::Id height=1024) : CanvasGL(width,height) { - ctx = NULL; + ctx = nullptr; this->ResizeBuffers(width, height); } diff --git a/vtkm/rendering/MapperRayTracer.h b/vtkm/rendering/MapperRayTracer.h index 8f05108e0..bf86e76bc 100644 --- a/vtkm/rendering/MapperRayTracer.h +++ b/vtkm/rendering/MapperRayTracer.h @@ -43,16 +43,16 @@ public: VTKM_CONT_EXPORT MapperRayTracer() { - this->Canvas = NULL; + this->Canvas = nullptr; } VTKM_CONT_EXPORT void SetCanvas(vtkm::rendering::Canvas *canvas) { - if(canvas != NULL) + if(canvas != nullptr) { this->Canvas = dynamic_cast(canvas); - if(this->Canvas == NULL) + if(this->Canvas == nullptr) { throw vtkm::cont::ErrorControlBadValue( "Ray Tracer: bad canvas type. Must be CanvasRayTracer"); diff --git a/vtkm/rendering/MapperVolume.h b/vtkm/rendering/MapperVolume.h index 8d6078846..9a7e8d93c 100644 --- a/vtkm/rendering/MapperVolume.h +++ b/vtkm/rendering/MapperVolume.h @@ -42,7 +42,7 @@ public: VTKM_CONT_EXPORT MapperVolume() { - this->Canvas = NULL; + this->Canvas = nullptr; } VTKM_CONT_EXPORT @@ -54,11 +54,11 @@ public: VTKM_CONT_EXPORT void SetCanvas(vtkm::rendering::Canvas *canvas) { - if(canvas != NULL) + if(canvas != nullptr) { this->Canvas = dynamic_cast(canvas); - if(this->Canvas == NULL) + if(this->Canvas == nullptr) { throw vtkm::cont::ErrorControlBadValue( "Volume Render: bad canvas type. Must be CanvasRayTracer"); diff --git a/vtkm/rendering/raytracing/Camera.h b/vtkm/rendering/raytracing/Camera.h index d3c1ed7c5..9a6f8cce3 100644 --- a/vtkm/rendering/raytracing/Camera.h +++ b/vtkm/rendering/raytracing/Camera.h @@ -419,10 +419,10 @@ public: void WriteToSurface(CanvasRayTracer *canvas, const vtkm::cont::ArrayHandle &distances) { - if(canvas == NULL) + if(canvas == nullptr) { throw vtkm::cont::ErrorControlBadValue( - "Camera can not write to NULL canvas"); + "Camera can not write to nullptr canvas"); } if(this->Height != vtkm::Int32(canvas->GetHeight()) || this->Width != vtkm::Int32(canvas->GetWidth())) diff --git a/vtkm/testing/UnitTestTransform3D.cxx b/vtkm/testing/UnitTestTransform3D.cxx index 43867023d..2acce06a1 100644 --- a/vtkm/testing/UnitTestTransform3D.cxx +++ b/vtkm/testing/UnitTestTransform3D.cxx @@ -199,7 +199,7 @@ struct TryTransformsFunctor void TestTransforms() { - vtkm::UInt32 seed = static_cast(time(NULL)); + vtkm::UInt32 seed = static_cast(time(nullptr)); std::cout << "Seed: " << seed << std::endl; g_RandomGenerator.seed(seed); diff --git a/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx b/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx index efc0503bb..a852a4cbf 100644 --- a/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx +++ b/vtkm/worklet/internal/testing/UnitTestDispatcherBase.cxx @@ -37,7 +37,7 @@ static const vtkm::Id ARRAY_SIZE = 10; struct TestExecObject { VTKM_EXEC_CONT_EXPORT - TestExecObject() : Array(NULL) { } + TestExecObject() : Array(nullptr) { } VTKM_EXEC_CONT_EXPORT TestExecObject(vtkm::Id *array) : Array(array) { } @@ -315,7 +315,7 @@ void TestInvokeWithDynamicAndBadTypes() try { std::cout << " First argument bad." << std::endl; - dispatcher.Invoke(NULL, execObject, array); + dispatcher.Invoke(nullptr, execObject, array); VTKM_TEST_FAIL("Dispatcher did not throw expected error."); } catch (vtkm::cont::ErrorControlBadType error) @@ -329,7 +329,7 @@ void TestInvokeWithDynamicAndBadTypes() try { std::cout << " Third argument bad." << std::endl; - dispatcher.Invoke(array, execObject, NULL); + dispatcher.Invoke(array, execObject, nullptr); VTKM_TEST_FAIL("Dispatcher did not throw expected error."); } catch (vtkm::cont::ErrorControlBadType error) diff --git a/vtkm/worklet/wavelets/WaveletFilter.h b/vtkm/worklet/wavelets/WaveletFilter.h index 49f583763..a194d4a91 100644 --- a/vtkm/worklet/wavelets/WaveletFilter.h +++ b/vtkm/worklet/wavelets/WaveletFilter.h @@ -43,7 +43,7 @@ enum WaveletName { BIOR1_1 // the same as HAAE }; -// Wavelet filter class; +// Wavelet filter class; // functionally equivalent to WaveFiltBase and its subclasses in VAPoR. class WaveletFilter { @@ -51,10 +51,10 @@ public: // constructor WaveletFilter( WaveletName wtype ) : symmetricity(true), filterLength(0), - lowDecomposeFilter(NULL), - highDecomposeFilter(NULL), - lowReconstructFilter(NULL), - highReconstructFilter(NULL) + lowDecomposeFilter(nullptr), + highDecomposeFilter(nullptr), + lowReconstructFilter(nullptr), + highReconstructFilter(nullptr) { if( wtype == CDF9_7 || wtype == BIOR4_4 ) { @@ -100,8 +100,8 @@ public: if( lowDecomposeFilter ) { delete[] lowDecomposeFilter; - lowDecomposeFilter = highDecomposeFilter = - lowReconstructFilter = highReconstructFilter = NULL ; + lowDecomposeFilter = highDecomposeFilter = + lowReconstructFilter = highReconstructFilter = nullptr ; } } @@ -154,19 +154,19 @@ private: { if( sigLength % 2 == 0 ) { - for (vtkm::Id count = 0; count < sigLength; count++) + for (vtkm::Id count = 0; count < sigLength; count++) { sigOut[count] = sigIn[sigLength - count - 1]; - if (count % 2 != 0) + if (count % 2 != 0) sigOut[count] = -1.0 * sigOut[count]; } } else { - for (vtkm::Id count = 0; count < sigLength; count++) + for (vtkm::Id count = 0; count < sigLength; count++) { sigOut[count] = sigIn[sigLength - count - 1]; - if (count % 2 == 0) + if (count % 2 == 0) sigOut[count] = -1.0 * sigOut[count]; } } @@ -199,4 +199,4 @@ private: } // namespace worklet } // namespace vtkm -#endif +#endif