diff --git a/Modules/Core/Common/include/itkExtractImageFilter.hxx b/Modules/Core/Common/include/itkExtractImageFilter.hxx index d5aa2ea8fab..049332a0761 100644 --- a/Modules/Core/Common/include/itkExtractImageFilter.hxx +++ b/Modules/Core/Common/include/itkExtractImageFilter.hxx @@ -295,7 +295,7 @@ void ExtractImageFilter::DynamicThreadedGenerateData( const OutputImageRegionType & outputRegionForThread) { - itkDebugMacro(<< "Actually executing"); + itkDebugMacro("Actually executing"); const InputImageType * inputPtr = this->GetInput(); OutputImageType * outputPtr = this->GetOutput(); diff --git a/Modules/Core/Common/include/itkGaussianOperator.hxx b/Modules/Core/Common/include/itkGaussianOperator.hxx index c2bb2976ab0..055a67c8d84 100644 --- a/Modules/Core/Common/include/itkGaussianOperator.hxx +++ b/Modules/Core/Common/include/itkGaussianOperator.hxx @@ -52,8 +52,8 @@ GaussianOperator::GenerateCoefficients() -> Coef } if (coeff.size() > m_MaximumKernelWidth) { - itkDebugMacro(<< "Kernel size has exceeded the specified maximum width of " << m_MaximumKernelWidth - << " and has been truncated to " << coeff.size() + itkDebugMacro("Kernel size has exceeded the specified maximum width of " + << m_MaximumKernelWidth << " and has been truncated to " << coeff.size() << " elements. You can raise the maximum width using the SetMaximumKernelWidth method."); break; } diff --git a/Modules/Core/Common/include/itkMacro.h b/Modules/Core/Common/include/itkMacro.h index 227192af13b..a92c46e0955 100644 --- a/Modules/Core/Common/include/itkMacro.h +++ b/Modules/Core/Common/include/itkMacro.h @@ -470,7 +470,7 @@ OutputWindowDisplayDebugText(const char *); /** This macro is used to print debug (or other information). They are * also used to catch errors, etc. Requires that the caller implements * the GetDebug() method (see itk::Object). Example usage looks like: - * itkDebugMacro(<< "this is debug info" << this->SomeVariable); */ + * itkDebugMacro("this is debug info" << this->SomeVariable); */ #if defined(NDEBUG) # define itkDebugMacro(x) ITK_NOOP_STATEMENT # define itkDebugStatement(x) ITK_NOOP_STATEMENT diff --git a/Modules/Core/Common/include/itkPointSetToImageFilter.hxx b/Modules/Core/Common/include/itkPointSetToImageFilter.hxx index 8640025ab61..cbe69e457cb 100644 --- a/Modules/Core/Common/include/itkPointSetToImageFilter.hxx +++ b/Modules/Core/Common/include/itkPointSetToImageFilter.hxx @@ -109,7 +109,7 @@ PointSetToImageFilter::GenerateData() { unsigned int i; - itkDebugMacro(<< "PointSetToImageFilter::Update() called"); + itkDebugMacro("PointSetToImageFilter::Update() called"); // Get the input and output pointers const InputPointSetType * InputPointSet = this->GetInput(); @@ -220,7 +220,7 @@ PointSetToImageFilter::GenerateData() ++pointItr; } - itkDebugMacro(<< "PointSetToImageFilter::Update() finished"); + itkDebugMacro("PointSetToImageFilter::Update() finished"); } // end update function template diff --git a/Modules/Core/Common/src/itkObject.cxx b/Modules/Core/Common/src/itkObject.cxx index 5c290c4e5f4..fcb49d00d31 100644 --- a/Modules/Core/Common/src/itkObject.cxx +++ b/Modules/Core/Common/src/itkObject.cxx @@ -361,7 +361,7 @@ Object::Modified() const void Object::Register() const { - itkDebugMacro(<< "Registered, " + itkDebugMacro("Registered, " << "ReferenceCount = " << (m_ReferenceCount + 1)); // call the parent @@ -375,7 +375,7 @@ void Object::UnRegister() const noexcept { // call the parent - itkDebugMacro(<< "UnRegistered, " + itkDebugMacro("UnRegistered, " << "ReferenceCount = " << (m_ReferenceCount - 1)); if ((m_ReferenceCount - 1) <= 0) @@ -415,7 +415,7 @@ Object::UnRegister() const noexcept void Object::SetReferenceCount(int ref) { - itkDebugMacro(<< "Reference Count set to " << ref); + itkDebugMacro("Reference Count set to " << ref); // ReferenceCount in now unlocked. We may have a race condition to // to delete the object. @@ -561,7 +561,7 @@ Object::Object() Object::~Object() { - itkDebugMacro(<< "Destructing!"); + itkDebugMacro("Destructing!"); } /** diff --git a/Modules/Core/GPUCommon/include/itkGPUImageDataManager.hxx b/Modules/Core/GPUCommon/include/itkGPUImageDataManager.hxx index a681e889144..6d7984088e6 100644 --- a/Modules/Core/GPUCommon/include/itkGPUImageDataManager.hxx +++ b/Modules/Core/GPUCommon/include/itkGPUImageDataManager.hxx @@ -78,7 +78,7 @@ GPUImageDataManager::MakeCPUBufferUpToDate() if ((m_IsCPUBufferDirty || (gpu_time > cpu_time)) && m_GPUBuffer != nullptr && m_CPUBuffer != nullptr) { cl_int errid; - itkDebugMacro(<< "GPU->CPU data copy"); + itkDebugMacro("GPU->CPU data copy"); errid = clEnqueueReadBuffer(m_ContextManager->GetCommandQueue(m_CommandQueueId), m_GPUBuffer, CL_TRUE, @@ -120,7 +120,7 @@ GPUImageDataManager::MakeGPUBufferUpToDate() if ((m_IsGPUBufferDirty || (gpu_time < cpu_time)) && m_CPUBuffer != nullptr && m_GPUBuffer != nullptr) { cl_int errid; - itkDebugMacro(<< "CPU->GPU data copy"); + itkDebugMacro("CPU->GPU data copy"); errid = clEnqueueWriteBuffer(m_ContextManager->GetCommandQueue(m_CommandQueueId), m_GPUBuffer, CL_TRUE, diff --git a/Modules/Core/Mesh/include/itkConnectedRegionsMeshFilter.hxx b/Modules/Core/Mesh/include/itkConnectedRegionsMeshFilter.hxx index 4eea64ef367..0a0e9ad5881 100644 --- a/Modules/Core/Mesh/include/itkConnectedRegionsMeshFilter.hxx +++ b/Modules/Core/Mesh/include/itkConnectedRegionsMeshFilter.hxx @@ -145,14 +145,14 @@ ConnectedRegionsMeshFilter::GenerateData() InputMeshCellsContainerConstPointer inCells = input->GetCells(); InputMeshCellDataContainerConstPointer inCellData = input->GetCellData(); - itkDebugMacro(<< "Executing connectivity"); + itkDebugMacro("Executing connectivity"); // Check input/allocate storage IdentifierType numCells = input->GetNumberOfCells(); IdentifierType numPts = input->GetNumberOfPoints(); if (numPts < 1 || numCells < 1) { - itkDebugMacro(<< "No data to connect!"); + itkDebugMacro("No data to connect!"); return; } @@ -273,7 +273,7 @@ ConnectedRegionsMeshFilter::GenerateData() delete m_Wave2; m_Wave = m_Wave2 = nullptr; - itkDebugMacro(<< "Extracted " << m_RegionNumber << " region(s)"); + itkDebugMacro("Extracted " << m_RegionNumber << " region(s)"); // Pass the point and point data through this->CopyInputMeshToOutputMeshPoints(); @@ -392,8 +392,8 @@ ConnectedRegionsMeshFilter::GenerateData() { count += regionSize; } - itkDebugMacro(<< "Total #of cells accounted for: " << count); - itkDebugMacro(<< "Extracted " << output->GetNumberOfCells() << " cells"); + itkDebugMacro("Total #of cells accounted for: " << count); + itkDebugMacro("Extracted " << output->GetNumberOfCells() << " cells"); } #endif diff --git a/Modules/Core/Mesh/include/itkMesh.hxx b/Modules/Core/Mesh/include/itkMesh.hxx index 50613bb929e..55415d0ff45 100644 --- a/Modules/Core/Mesh/include/itkMesh.hxx +++ b/Modules/Core/Mesh/include/itkMesh.hxx @@ -1050,7 +1050,7 @@ Mesh::ReleaseCellsMemory() while (cell != end) { const CellType * cellToBeDeleted = cell->Value(); - itkDebugMacro(<< "Mesh destructor deleting cell = " << cellToBeDeleted); + itkDebugMacro("Mesh destructor deleting cell = " << cellToBeDeleted); delete cellToBeDeleted; ++cell; } diff --git a/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx b/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx index 776de90443f..632d5011e98 100644 --- a/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx +++ b/Modules/Core/Mesh/include/itkTriangleMeshToBinaryImageFilter.hxx @@ -135,7 +135,7 @@ template void TriangleMeshToBinaryImageFilter::GenerateData() { - itkDebugMacro(<< "TriangleMeshToBinaryImageFilter::Update() called"); + itkDebugMacro("TriangleMeshToBinaryImageFilter::Update() called"); // Get the input and output pointers OutputImagePointer OutputImage = this->GetOutput(); @@ -155,7 +155,7 @@ TriangleMeshToBinaryImageFilter::GenerateData() } else { - itkDebugMacro(<< "Using info image"); + itkDebugMacro("Using info image"); m_InfoImage->Update(); OutputImage->CopyInformation(m_InfoImage); OutputImage->SetRegions(m_InfoImage->GetLargestPossibleRegion()); @@ -170,7 +170,7 @@ TriangleMeshToBinaryImageFilter::GenerateData() RasterizeTriangles(); - itkDebugMacro(<< "TriangleMeshToBinaryImageFilter::Update() finished"); + itkDebugMacro("TriangleMeshToBinaryImageFilter::Update() finished"); } template diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageFilter.hxx b/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageFilter.hxx index 4ba342f4d67..fb4235129da 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageFilter.hxx +++ b/Modules/Core/SpatialObjects/include/itkSpatialObjectToImageFilter.hxx @@ -265,7 +265,7 @@ SpatialObjectToImageFilter::GenerateData() { unsigned int i; - itkDebugMacro(<< "SpatialObjectToImageFilter::Update() called"); + itkDebugMacro("SpatialObjectToImageFilter::Update() called"); // Get the input and output pointers const InputSpatialObjectType * InputObject = this->GetInput(); @@ -363,7 +363,7 @@ SpatialObjectToImageFilter::GenerateData() progress.CompletedPixel(); } - itkDebugMacro(<< "SpatialObjectToImageFilter::Update() finished"); + itkDebugMacro("SpatialObjectToImageFilter::Update() finished"); } // end update function template diff --git a/Modules/Core/TestKernel/include/itkRandomImageSource.hxx b/Modules/Core/TestKernel/include/itkRandomImageSource.hxx index 4019312d538..d2c62c3e393 100644 --- a/Modules/Core/TestKernel/include/itkRandomImageSource.hxx +++ b/Modules/Core/TestKernel/include/itkRandomImageSource.hxx @@ -213,7 +213,7 @@ template void RandomImageSource::DynamicThreadedGenerateData(const OutputImageRegionType & outputRegionForThread) { - itkDebugMacro(<< "Generating a random image of scalars"); + itkDebugMacro("Generating a random image of scalars"); using scalarType = typename TOutputImage::PixelType; diff --git a/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.hxx b/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.hxx index cc4db743c0b..1ed56310a79 100644 --- a/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.hxx +++ b/Modules/Core/TestKernel/include/itkTestingExtractSliceImageFilter.hxx @@ -246,7 +246,7 @@ ExtractSliceImageFilter::DynamicThreadedGenerateData( const OutputImageRegionType & outputRegionForThread) { - itkDebugMacro(<< "Actually executing"); + itkDebugMacro("Actually executing"); // Get the input and output pointers const TInputImage * inputPtr = this->GetInput(); diff --git a/Modules/Core/Transform/include/itkCenteredEuler3DTransform.hxx b/Modules/Core/Transform/include/itkCenteredEuler3DTransform.hxx index e52c8217dc0..2e9a00e3aa3 100644 --- a/Modules/Core/Transform/include/itkCenteredEuler3DTransform.hxx +++ b/Modules/Core/Transform/include/itkCenteredEuler3DTransform.hxx @@ -53,7 +53,7 @@ template void CenteredEuler3DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters if (¶meters != &(this->m_Parameters)) @@ -84,7 +84,7 @@ CenteredEuler3DTransform::SetParameters(const ParametersTy // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } // diff --git a/Modules/Core/Transform/include/itkCenteredRigid2DTransform.hxx b/Modules/Core/Transform/include/itkCenteredRigid2DTransform.hxx index a529d4affd8..22611cd5b88 100644 --- a/Modules/Core/Transform/include/itkCenteredRigid2DTransform.hxx +++ b/Modules/Core/Transform/include/itkCenteredRigid2DTransform.hxx @@ -39,7 +39,7 @@ template void CenteredRigid2DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Parameters are ordered as: // // p[0] = angle @@ -81,7 +81,7 @@ CenteredRigid2DTransform::SetParameters(const ParametersTy // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } @@ -89,7 +89,7 @@ template auto CenteredRigid2DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); // Parameters are ordered as: // // p[0] = angle @@ -110,7 +110,7 @@ CenteredRigid2DTransform::GetParameters() const -> const P this->m_Parameters[j + 1 + SpaceDimension] = this->GetTranslation()[j]; } - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkCenteredSimilarity2DTransform.hxx b/Modules/Core/Transform/include/itkCenteredSimilarity2DTransform.hxx index 6fe7e89c513..6b2b424ea9e 100644 --- a/Modules/Core/Transform/include/itkCenteredSimilarity2DTransform.hxx +++ b/Modules/Core/Transform/include/itkCenteredSimilarity2DTransform.hxx @@ -39,7 +39,7 @@ template void CenteredSimilarity2DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -78,7 +78,7 @@ CenteredSimilarity2DTransform::SetParameters(const Paramet // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } @@ -86,7 +86,7 @@ template auto CenteredSimilarity2DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetScale(); this->m_Parameters[1] = this->GetAngle(); @@ -103,7 +103,7 @@ CenteredSimilarity2DTransform::GetParameters() const -> co this->m_Parameters[i + 4] = translation[i]; } - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkComposeScaleSkewVersor3DTransform.hxx b/Modules/Core/Transform/include/itkComposeScaleSkewVersor3DTransform.hxx index 81f642dedf7..e0c36c95fa6 100644 --- a/Modules/Core/Transform/include/itkComposeScaleSkewVersor3DTransform.hxx +++ b/Modules/Core/Transform/include/itkComposeScaleSkewVersor3DTransform.hxx @@ -78,7 +78,7 @@ template void ComposeScaleSkewVersor3DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -110,7 +110,7 @@ ComposeScaleSkewVersor3DTransform::SetParameters(const Par newVersor.Set(axis); this->SetVarVersor(newVersor); - itkDebugMacro(<< "Versor is now " << newVersor); + itkDebugMacro("Versor is now " << newVersor); // Matrix must be defined before translation so that offset can be computed // from translation @@ -136,7 +136,7 @@ ComposeScaleSkewVersor3DTransform::SetParameters(const Par // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } // @@ -154,7 +154,7 @@ template auto ComposeScaleSkewVersor3DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetVersor().GetX(); this->m_Parameters[1] = this->GetVersor().GetY(); @@ -172,7 +172,7 @@ ComposeScaleSkewVersor3DTransform::GetParameters() const - this->m_Parameters[10] = this->GetSkew()[1]; this->m_Parameters[11] = this->GetSkew()[2]; - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkEuler3DTransform.hxx b/Modules/Core/Transform/include/itkEuler3DTransform.hxx index 5eb2ff463f3..d1eeeccb55c 100644 --- a/Modules/Core/Transform/include/itkEuler3DTransform.hxx +++ b/Modules/Core/Transform/include/itkEuler3DTransform.hxx @@ -70,7 +70,7 @@ template void Euler3DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -96,7 +96,7 @@ Euler3DTransform::SetParameters(const ParametersType & par // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } template diff --git a/Modules/Core/Transform/include/itkRigid2DTransform.hxx b/Modules/Core/Transform/include/itkRigid2DTransform.hxx index 7d58e83bbcc..258fc307d51 100644 --- a/Modules/Core/Transform/include/itkRigid2DTransform.hxx +++ b/Modules/Core/Transform/include/itkRigid2DTransform.hxx @@ -223,7 +223,7 @@ template void Rigid2DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -251,7 +251,7 @@ Rigid2DTransform::SetParameters(const ParametersType & par // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } @@ -259,7 +259,7 @@ template auto Rigid2DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); // Get the angle this->m_Parameters[0] = this->GetAngle(); @@ -269,7 +269,7 @@ Rigid2DTransform::GetParameters() const -> const Parameter this->m_Parameters[i + 1] = this->GetTranslation()[i]; } - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkRigid3DPerspectiveTransform.hxx b/Modules/Core/Transform/include/itkRigid3DPerspectiveTransform.hxx index 974a83fc66e..ca2e4bc9c4e 100644 --- a/Modules/Core/Transform/include/itkRigid3DPerspectiveTransform.hxx +++ b/Modules/Core/Transform/include/itkRigid3DPerspectiveTransform.hxx @@ -57,7 +57,7 @@ template void Rigid3DPerspectiveTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -88,7 +88,7 @@ Rigid3DPerspectiveTransform::SetParameters(const Parameter m_Versor.Set(axis); - itkDebugMacro(<< "Versor is now " << this->GetRotation()); + itkDebugMacro("Versor is now " << this->GetRotation()); // Transfer the translation part OffsetType offset; @@ -111,7 +111,7 @@ template auto Rigid3DPerspectiveTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetRotation().GetX(); this->m_Parameters[1] = this->GetRotation().GetY(); @@ -122,7 +122,7 @@ Rigid3DPerspectiveTransform::GetParameters() const -> cons this->m_Parameters[4] = this->GetOffset()[1]; this->m_Parameters[5] = this->GetOffset()[2]; - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkScaleLogarithmicTransform.hxx b/Modules/Core/Transform/include/itkScaleLogarithmicTransform.hxx index a2734043455..9b11689ef9f 100644 --- a/Modules/Core/Transform/include/itkScaleLogarithmicTransform.hxx +++ b/Modules/Core/Transform/include/itkScaleLogarithmicTransform.hxx @@ -49,7 +49,7 @@ template auto ScaleLogarithmicTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); const ScaleType & scales = this->GetScale(); // Transfer the translation part @@ -58,7 +58,7 @@ ScaleLogarithmicTransform::GetParameters() con this->m_Parameters[i] = std::log(scales[i]); } - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkScaleSkewVersor3DTransform.hxx b/Modules/Core/Transform/include/itkScaleSkewVersor3DTransform.hxx index 3d7f813580f..f7078e783df 100644 --- a/Modules/Core/Transform/include/itkScaleSkewVersor3DTransform.hxx +++ b/Modules/Core/Transform/include/itkScaleSkewVersor3DTransform.hxx @@ -74,7 +74,7 @@ template void ScaleSkewVersor3DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -106,7 +106,7 @@ ScaleSkewVersor3DTransform::SetParameters(const Parameters newVersor.Set(axis); this->SetVarVersor(newVersor); - itkDebugMacro(<< "Versor is now " << newVersor); + itkDebugMacro("Versor is now " << newVersor); // Matrix must be defined before translation so that offset can be computed // from translation @@ -135,7 +135,7 @@ ScaleSkewVersor3DTransform::SetParameters(const Parameters // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } // @@ -153,7 +153,7 @@ template auto ScaleSkewVersor3DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetVersor().GetX(); this->m_Parameters[1] = this->GetVersor().GetY(); @@ -174,7 +174,7 @@ ScaleSkewVersor3DTransform::GetParameters() const -> const this->m_Parameters[13] = this->GetSkew()[4]; this->m_Parameters[14] = this->GetSkew()[5]; - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkScaleTransform.hxx b/Modules/Core/Transform/include/itkScaleTransform.hxx index 6019e57db76..3133c4dd180 100644 --- a/Modules/Core/Transform/include/itkScaleTransform.hxx +++ b/Modules/Core/Transform/include/itkScaleTransform.hxx @@ -57,14 +57,14 @@ template auto ScaleTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); // Transfer the translation part for (unsigned int i = 0; i < SpaceDimension; ++i) { this->m_Parameters[i] = m_Scale[i]; } - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkScaleVersor3DTransform.hxx b/Modules/Core/Transform/include/itkScaleVersor3DTransform.hxx index 7c88cbb22b4..2322fc62a88 100644 --- a/Modules/Core/Transform/include/itkScaleVersor3DTransform.hxx +++ b/Modules/Core/Transform/include/itkScaleVersor3DTransform.hxx @@ -71,7 +71,7 @@ template void ScaleVersor3DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -103,7 +103,7 @@ ScaleVersor3DTransform::SetParameters(const ParametersType newVersor.Set(axis); this->SetVarVersor(newVersor); - itkDebugMacro(<< "Versor is now " << newVersor); + itkDebugMacro("Versor is now " << newVersor); // Matrix must be defined before translation so that offset can be computed // from translation @@ -124,7 +124,7 @@ ScaleVersor3DTransform::SetParameters(const ParametersType // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } // @@ -141,7 +141,7 @@ template auto ScaleVersor3DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetVersor().GetX(); this->m_Parameters[1] = this->GetVersor().GetY(); @@ -155,7 +155,7 @@ ScaleVersor3DTransform::GetParameters() const -> const Par this->m_Parameters[7] = this->GetScale()[1]; this->m_Parameters[8] = this->GetScale()[2]; - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkSimilarity2DTransform.hxx b/Modules/Core/Transform/include/itkSimilarity2DTransform.hxx index b0e6d2ff805..54d4a5a44d0 100644 --- a/Modules/Core/Transform/include/itkSimilarity2DTransform.hxx +++ b/Modules/Core/Transform/include/itkSimilarity2DTransform.hxx @@ -51,7 +51,7 @@ template void Similarity2DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -82,7 +82,7 @@ Similarity2DTransform::SetParameters(const ParametersType // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } @@ -90,7 +90,7 @@ template auto Similarity2DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetScale(); this->m_Parameters[1] = this->GetAngle(); @@ -102,7 +102,7 @@ Similarity2DTransform::GetParameters() const -> const Para this->m_Parameters[i + 2] = translation[i]; } - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkSimilarity3DTransform.hxx b/Modules/Core/Transform/include/itkSimilarity3DTransform.hxx index 0d61e32329c..b1e13d2d30a 100644 --- a/Modules/Core/Transform/include/itkSimilarity3DTransform.hxx +++ b/Modules/Core/Transform/include/itkSimilarity3DTransform.hxx @@ -122,7 +122,7 @@ template void Similarity3DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -156,7 +156,7 @@ Similarity3DTransform::SetParameters(const ParametersType m_Scale = parameters[6]; // must be set before calling ComputeMatrix(); this->ComputeMatrix(); - itkDebugMacro(<< "Versor is now " << this->GetVersor()); + itkDebugMacro("Versor is now " << this->GetVersor()); // Transfer the translation part TranslationType newTranslation; @@ -170,7 +170,7 @@ Similarity3DTransform::SetParameters(const ParametersType // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } // @@ -187,7 +187,7 @@ template auto Similarity3DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetVersor().GetX(); this->m_Parameters[1] = this->GetVersor().GetY(); @@ -200,7 +200,7 @@ Similarity3DTransform::GetParameters() const -> const Para this->m_Parameters[6] = this->GetScale(); - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkVersorRigid3DTransform.hxx b/Modules/Core/Transform/include/itkVersorRigid3DTransform.hxx index 03ed35dce1e..fa7601a9b20 100644 --- a/Modules/Core/Transform/include/itkVersorRigid3DTransform.hxx +++ b/Modules/Core/Transform/include/itkVersorRigid3DTransform.hxx @@ -45,7 +45,7 @@ template void VersorRigid3DTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -73,7 +73,7 @@ VersorRigid3DTransform::SetParameters(const ParametersType this->SetVarVersor(newVersor); this->ComputeMatrix(); - itkDebugMacro(<< "Versor is now " << this->GetVersor()); + itkDebugMacro("Versor is now " << this->GetVersor()); // Transfer the translation part TranslationType newTranslation; @@ -87,7 +87,7 @@ VersorRigid3DTransform::SetParameters(const ParametersType // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } // @@ -103,7 +103,7 @@ template auto VersorRigid3DTransform::GetParameters() const -> const ParametersType & { - itkDebugMacro(<< "Getting parameters "); + itkDebugMacro("Getting parameters "); this->m_Parameters[0] = this->GetVersor().GetX(); this->m_Parameters[1] = this->GetVersor().GetY(); @@ -114,7 +114,7 @@ VersorRigid3DTransform::GetParameters() const -> const Par this->m_Parameters[4] = this->GetTranslation()[1]; this->m_Parameters[5] = this->GetTranslation()[2]; - itkDebugMacro(<< "After getting parameters " << this->m_Parameters); + itkDebugMacro("After getting parameters " << this->m_Parameters); return this->m_Parameters; } diff --git a/Modules/Core/Transform/include/itkVersorTransform.hxx b/Modules/Core/Transform/include/itkVersorTransform.hxx index f7996ff0cfd..dd3f43e870f 100644 --- a/Modules/Core/Transform/include/itkVersorTransform.hxx +++ b/Modules/Core/Transform/include/itkVersorTransform.hxx @@ -48,7 +48,7 @@ template void VersorTransform::SetParameters(const ParametersType & parameters) { - itkDebugMacro(<< "Setting parameters " << parameters); + itkDebugMacro("Setting parameters " << parameters); // Save parameters. Needed for proper operation of TransformUpdateParameters. if (¶meters != &(this->m_Parameters)) @@ -66,7 +66,7 @@ VersorTransform::SetParameters(const ParametersType & para // The versor will compute the scalar part. m_Versor.Set(rightPart); - itkDebugMacro(<< "Versor is now " << m_Versor); + itkDebugMacro("Versor is now " << m_Versor); this->ComputeMatrix(); this->ComputeOffset(); @@ -75,7 +75,7 @@ VersorTransform::SetParameters(const ParametersType & para // parameters and cannot know if the parameters have changed. this->Modified(); - itkDebugMacro(<< "After setting parameters "); + itkDebugMacro("After setting parameters "); } template diff --git a/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx b/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx index eceea6789e5..bce52154eb2 100644 --- a/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx +++ b/Modules/Filtering/BiasCorrection/include/itkMRIBiasFieldCorrectionFilter.hxx @@ -293,7 +293,7 @@ MRIBiasFieldCorrectionFilter::SetSchedule { if (schedule.rows() != m_NumberOfLevels || schedule.columns() != ImageDimension) { - itkDebugMacro(<< "Schedule has wrong dimensions"); + itkDebugMacro("Schedule has wrong dimensions"); return; } @@ -441,7 +441,7 @@ MRIBiasFieldCorrectionFilter::EstimateBia int maximumIteration) -> BiasFieldType { - itkDebugMacro(<< "Estimating bias field "); + itkDebugMacro("Estimating bias field "); bool cleanCoeffs = false; BiasFieldType::DomainSizeType biasSize; @@ -547,7 +547,7 @@ void MRIBiasFieldCorrectionFilter::CorrectImage(BiasFieldType & bias, InputImageRegionType region) { - itkDebugMacro(<< "Correcting the image "); + itkDebugMacro("Correcting the image "); using Pixel = InternalImagePixelType; ImageRegionIterator iIter(m_InternalInput, region); BiasFieldType::SimpleForwardIterator bIter(&bias); @@ -558,7 +558,7 @@ MRIBiasFieldCorrectionFilter::CorrectImag bIter.Begin(); if (m_OutputMask.IsNotNull()) { - itkDebugMacro(<< "Output mask is being used"); + itkDebugMacro("Output mask is being used"); ImageRegionIterator mIter(m_OutputMask, region); mIter.GoToBegin(); while (!bIter.IsAtEnd()) @@ -580,7 +580,7 @@ MRIBiasFieldCorrectionFilter::CorrectImag } else { - itkDebugMacro(<< "Output mask is not being used"); + itkDebugMacro("Output mask is not being used"); while (!bIter.IsAtEnd()) { double diff = iIter.Get() - bIter.Get(); @@ -626,13 +626,13 @@ template void MRIBiasFieldCorrectionFilter::GenerateData() { - itkDebugMacro(<< "Initializing filter..."); + itkDebugMacro("Initializing filter..."); this->Initialize(); - itkDebugMacro(<< "Filter initialized."); + itkDebugMacro("Filter initialized."); if (m_UsingSlabIdentification) { - itkDebugMacro(<< "Searching slabs..."); + itkDebugMacro("Searching slabs..."); typename MRASlabIdentifier::Pointer identifier = MRASlabIdentifier::New(); // Find slabs @@ -654,7 +654,7 @@ MRIBiasFieldCorrectionFilter::GenerateDat } this->AdjustSlabRegions(m_Slabs, this->GetOutput()->GetRequestedRegion()); - itkDebugMacro(<< "After adjustment, there are " << static_cast(m_Slabs.size()) << " slabs."); + itkDebugMacro("After adjustment, there are " << static_cast(m_Slabs.size()) << " slabs."); auto iter = m_Slabs.begin(); @@ -677,15 +677,15 @@ MRIBiasFieldCorrectionFilter::GenerateDat if (m_UsingInterSliceIntensityCorrection) { - itkDebugMacro(<< " Correcting inter-slice intensity..."); + itkDebugMacro(" Correcting inter-slice intensity..."); this->CorrectInterSliceIntensityInhomogeneity(*iter); - itkDebugMacro(<< " Inter-slice intensity corrected."); + itkDebugMacro(" Inter-slice intensity corrected."); } // Correct 3D bias if (m_UsingBiasFieldCorrection) { - itkDebugMacro(<< " Correcting bias..."); + itkDebugMacro(" Correcting bias..."); m_BiasFieldCoefficients.clear(); for (int i = 0; i < nCoef; ++i) @@ -709,7 +709,7 @@ MRIBiasFieldCorrectionFilter::GenerateDat } this->CorrectImage(bias, *iter); - itkDebugMacro(<< " Bias corrected."); + itkDebugMacro(" Bias corrected."); } ++iter; } @@ -730,7 +730,7 @@ MRIBiasFieldCorrectionFilter::GenerateDat if (m_GeneratingOutput) { - itkDebugMacro(<< "Generating the output image..."); + itkDebugMacro("Generating the output image..."); if (this->GetBiasFieldMultiplicative()) { @@ -742,7 +742,7 @@ MRIBiasFieldCorrectionFilter::GenerateDat output->Allocate(); CopyAndConvertImage(m_InternalInput.GetPointer(), output, output->GetRequestedRegion()); - itkDebugMacro(<< "The output image generated."); + itkDebugMacro("The output image generated."); } } diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.hxx b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.hxx index a77252469a9..43e62ec1229 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.hxx +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.hxx @@ -55,7 +55,7 @@ template void BinaryPruningImageFilter::PrepareData() { - itkDebugMacro(<< "PrepareData Start"); + itkDebugMacro("PrepareData Start"); OutputImagePointer pruneImage = GetPruning(); InputImagePointer inputImage = dynamic_cast(ProcessObject::GetInput(0)); @@ -68,7 +68,7 @@ BinaryPruningImageFilter::PrepareData() ImageRegionConstIterator it(inputImage, region); ImageRegionIterator ot(pruneImage, region); - itkDebugMacro(<< "PrepareData: Copy input to output"); + itkDebugMacro("PrepareData: Copy input to output"); while (!ot.IsAtEnd()) { @@ -76,7 +76,7 @@ BinaryPruningImageFilter::PrepareData() ++it; ++ot; } - itkDebugMacro(<< "PrepareData End"); + itkDebugMacro("PrepareData End"); } /** @@ -86,7 +86,7 @@ template void BinaryPruningImageFilter::ComputePruneImage() { - itkDebugMacro(<< "ComputeThinImage Start"); + itkDebugMacro("ComputeThinImage Start"); OutputImagePointer pruneImage = GetPruning(); typename OutputImageType::RegionType region = pruneImage->GetRequestedRegion(); @@ -128,7 +128,7 @@ BinaryPruningImageFilter::ComputePruneImage() } ++count; } - itkDebugMacro(<< "ComputeThinImage End"); + itkDebugMacro("ComputeThinImage End"); } /** @@ -140,7 +140,7 @@ BinaryPruningImageFilter::GenerateData() { this->PrepareData(); - itkDebugMacro(<< "GenerateData: Computing Thinning Image"); + itkDebugMacro("GenerateData: Computing Thinning Image"); this->ComputePruneImage(); } // end GenerateData() diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx index 1ecce36dc33..1ea2f32e5f3 100644 --- a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx +++ b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryThinningImageFilter.hxx @@ -56,7 +56,7 @@ template void BinaryThinningImageFilter::PrepareData() { - itkDebugMacro(<< "PrepareData Start"); + itkDebugMacro("PrepareData Start"); OutputImagePointer thinImage = GetThinning(); InputImagePointer inputImage = dynamic_cast(ProcessObject::GetInput(0)); @@ -69,7 +69,7 @@ BinaryThinningImageFilter::PrepareData() ImageRegionConstIterator it(inputImage, region); ImageRegionIterator ot(thinImage, region); - itkDebugMacro(<< "PrepareData: Copy input to output"); + itkDebugMacro("PrepareData: Copy input to output"); // Copy the input to the output, changing all foreground pixels to // have value 1 in the process. @@ -86,7 +86,7 @@ BinaryThinningImageFilter::PrepareData() ++it; ++ot; } - itkDebugMacro(<< "PrepareData End"); + itkDebugMacro("PrepareData End"); } /** @@ -96,7 +96,7 @@ template void BinaryThinningImageFilter::ComputeThinImage() { - itkDebugMacro(<< "ComputeThinImage Start"); + itkDebugMacro("ComputeThinImage Start"); OutputImagePointer thinImage = GetThinning(); typename OutputImageType::RegionType region = thinImage->GetRequestedRegion(); @@ -275,7 +275,7 @@ BinaryThinningImageFilter::ComputeThinImage() } // end step loop } // end noChange while loop - itkDebugMacro(<< "ComputeThinImage End"); + itkDebugMacro("ComputeThinImage End"); } /** @@ -287,7 +287,7 @@ BinaryThinningImageFilter::GenerateData() { this->PrepareData(); - itkDebugMacro(<< "GenerateData: Computing Thinning Image"); + itkDebugMacro("GenerateData: Computing Thinning Image"); this->ComputeThinImage(); } // end GenerateData() } // end namespace itk diff --git a/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingBaseImageFilter.hxx b/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingBaseImageFilter.hxx index 5ff407de7fa..2366bd90485 100644 --- a/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingBaseImageFilter.hxx +++ b/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingBaseImageFilter.hxx @@ -100,7 +100,7 @@ PatchBasedDenoisingBaseImageFilter::GenerateData() // Find the optimal kernel bandwidth parameter. this->ComputeKernelBandwidthUpdate(); } - itkDebugMacro(<< "Computing Image Update iteration " << m_ElapsedIterations + 1 << " of " << m_NumberOfIterations); + itkDebugMacro("Computing Image Update iteration " << m_ElapsedIterations + 1 << " of " << m_NumberOfIterations); // Update the image intensities to denoise the image. this->ComputeImageUpdate(); diff --git a/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx b/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx index ebd136d5169..a7f1b52e5ab 100644 --- a/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx +++ b/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx @@ -171,14 +171,15 @@ PatchBasedDenoisingImageFilter::GenerateInputRequeste // Pad the input requested region by the operator radius inputRequestedRegion.PadByRadius(voxelNeighborhoodSize); - itkDebugMacro(<< "Padding inputRequestedRegion by " << voxelNeighborhoodSize << '\n' + itkDebugMacro("Padding inputRequestedRegion by " + << voxelNeighborhoodSize << '\n' << "inputRequestedRegion: " << inputRequestedRegion << '\n' << "largestPossibleRegion: " << inputPtr->GetLargestPossibleRegion()); // Crop the input requested region at the input's largest possible region if (inputRequestedRegion.Crop(inputPtr->GetLargestPossibleRegion())) { - itkDebugMacro(<< "Cropped inputRequestedRegion to: " << inputRequestedRegion); + itkDebugMacro("Cropped inputRequestedRegion to: " << inputRequestedRegion); inputPtr->SetRequestedRegion(inputRequestedRegion); return; } @@ -245,9 +246,9 @@ PatchBasedDenoisingImageFilter::Initialize() // For automatic sigma estimation, can't use more than 100% of pixels. m_SigmaUpdateDecimationFactor = std::max(m_SigmaUpdateDecimationFactor, 1u); - itkDebugMacro(<< "m_KernelBandwidthFractionPixelsForEstimation: " << m_KernelBandwidthFractionPixelsForEstimation - << ", " - << "m_SigmaUpdateDecimationFactor: " << m_SigmaUpdateDecimationFactor); + itkDebugMacro("m_KernelBandwidthFractionPixelsForEstimation: " << m_KernelBandwidthFractionPixelsForEstimation << ", " + << "m_SigmaUpdateDecimationFactor: " + << m_SigmaUpdateDecimationFactor); // Get the number of components per pixel in the input image. m_NumPixelComponents = this->GetInput()->GetNumberOfComponentsPerPixel(); @@ -342,7 +343,8 @@ PatchBasedDenoisingImageFilter::Initialize() } } - itkDebugMacro(<< "Image Intensity range: [" << m_ImageMin << ',' << m_ImageMax << "], " + itkDebugMacro("Image Intensity range: [" + << m_ImageMin << ',' << m_ImageMax << "], " << "IntensityRescaleInvFactor: " << m_IntensityRescaleInvFactor << " , " << "KernelBandwidthMultiplicationFactor: " << m_KernelBandwidthMultiplicationFactor << " , " << "KernelBandwidthSigma initialized to: " << m_KernelBandwidthSigma); @@ -752,11 +754,11 @@ typename PatchBasedDenoisingImageFilter::ThreadDataSt threadData.minNorm[0] = std::sqrt(minNorm[0]); threadData.maxNorm[0] = std::sqrt(maxNorm[0]); - itkDebugMacro(<< "threadData minNorm: " << minNorm[0] << ", maxNorm: " << maxNorm[0]); + itkDebugMacro("threadData minNorm: " << minNorm[0] << ", maxNorm: " << maxNorm[0]); } else { - itkDebugMacro(<< "no pixels in this region"); + itkDebugMacro("no pixels in this region"); } return threadData; } @@ -791,7 +793,7 @@ PatchBasedDenoisingImageFilter::ResolveRiemannianMinM } } - itkDebugMacro(<< "image min resolved to: " << m_ImageMin << ", image max resolved to: " << m_ImageMax); + itkDebugMacro("image min resolved to: " << m_ImageMin << ", image max resolved to: " << m_ImageMax); } template @@ -1649,7 +1651,7 @@ PatchBasedDenoisingImageFilter::ThreadedComputeSigmaU else { InputImagePatchIterator queryIt = sampler->GetSample()->GetMeasurementVector(currentPatchId)[0]; - itkDebugMacro(<< "unexpected index for current patch, search results are empty." + itkDebugMacro("unexpected index for current patch, search results are empty." << "\ncurrent patch id: " << currentPatchId << "\ncurrent patch index: " << nIndex << "\nindex calculated by searcher: " << queryIt.GetIndex(queryIt.GetCenterNeighborhoodIndex()) << "\npatch accessed by searcher: "); @@ -1831,7 +1833,7 @@ PatchBasedDenoisingImageFilter::ResolveSigmaUpdate() continue; } - itkDebugMacro(<< "Resolving sigma update for pixel component " << ic); + itkDebugMacro("Resolving sigma update for pixel component " << ic); // Accumulate the first and second derivatives from all the threads const RealValueType kernelSigma = m_KernelBandwidthSigma[ic]; @@ -1849,15 +1851,15 @@ PatchBasedDenoisingImageFilter::ResolveSigmaUpdate() firstDerivative /= static_cast(m_TotalNumberPixels); secondDerivative /= static_cast(m_TotalNumberPixels); - itkDebugMacro(<< "first deriv: " << firstDerivative << ", second deriv: " << secondDerivative - << ", old sigma: " << kernelSigma); + itkDebugMacro("first deriv: " << firstDerivative << ", second deriv: " << secondDerivative + << ", old sigma: " << kernelSigma); // If second derivative is zero or negative, compute update using gradient // descent if ((Math::ExactlyEquals(itk::Math::abs(secondDerivative), NumericTraits::ZeroValue())) || (secondDerivative < 0)) { - itkDebugMacro(<< "** Second derivative NOT POSITIVE"); + itkDebugMacro("** Second derivative NOT POSITIVE"); sigmaUpdate[ic] = -itk::Math::sgn(firstDerivative) * kernelSigma * 0.3; } else @@ -1866,30 +1868,30 @@ PatchBasedDenoisingImageFilter::ResolveSigmaUpdate() sigmaUpdate[ic] = -firstDerivative / secondDerivative; } - itkDebugMacro(<< "update: " << sigmaUpdate[ic]); + itkDebugMacro("update: " << sigmaUpdate[ic]); // Avoid very large updates to prevent instabilities in Newton-Raphson if (itk::Math::abs(sigmaUpdate[ic]) > kernelSigma * 0.3) { - itkDebugMacro(<< "** Restricting large updates \n"); + itkDebugMacro("** Restricting large updates \n"); sigmaUpdate[ic] = itk::Math::sgn(sigmaUpdate[ic]) * kernelSigma * 0.3; - itkDebugMacro(<< "update: " << sigmaUpdate[ic]); + itkDebugMacro("update: " << sigmaUpdate[ic]); } // keep the updated sigma from being too close to zero if (kernelSigma + sigmaUpdate[ic] < m_MinSigma) { - itkDebugMacro(<< "** TOO SMALL SIGMA: adjusting sigma"); + itkDebugMacro("** TOO SMALL SIGMA: adjusting sigma"); m_KernelBandwidthSigma[ic] = (kernelSigma + m_MinSigma) / 2.0; - itkDebugMacro(<< "new sigma: " << m_KernelBandwidthSigma[ic]); + itkDebugMacro("new sigma: " << m_KernelBandwidthSigma[ic]); } else { m_KernelBandwidthSigma[ic] = kernelSigma + sigmaUpdate[ic]; - itkDebugMacro(<< "new sigma: " << m_KernelBandwidthSigma[ic]); + itkDebugMacro("new sigma: " << m_KernelBandwidthSigma[ic]); } } // end for each independent pixel component diff --git a/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.hxx b/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.hxx index 6bb8817cf40..60d4319e74d 100644 --- a/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.hxx +++ b/Modules/Filtering/DisplacementField/include/itkExponentialDisplacementFieldImageFilter.hxx @@ -66,7 +66,7 @@ template void ExponentialDisplacementFieldImageFilter::GenerateData() { - itkDebugMacro(<< "Actually executing"); + itkDebugMacro("Actually executing"); InputImageConstPointer inputPtr = this->GetInput(); diff --git a/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.hxx b/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.hxx index 6f072d9a9fc..44415a6abe1 100644 --- a/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.hxx +++ b/Modules/Filtering/DisplacementField/include/itkInverseDisplacementFieldImageFilter.hxx @@ -182,16 +182,16 @@ InverseDisplacementFieldImageFilter::PrepareKernelBas ++ot; } - itkDebugMacro(<< "Number of Landmarks created = " << numberOfLandmarks); + itkDebugMacro("Number of Landmarks created = " << numberOfLandmarks); m_KernelTransform->GetModifiableTargetLandmarks()->SetPoints(target); m_KernelTransform->GetModifiableSourceLandmarks()->SetPoints(source); - itkDebugMacro(<< "Before ComputeWMatrix() "); + itkDebugMacro("Before ComputeWMatrix() "); m_KernelTransform->ComputeWMatrix(); - itkDebugMacro(<< "After ComputeWMatrix() "); + itkDebugMacro("After ComputeWMatrix() "); } /** @@ -205,7 +205,7 @@ InverseDisplacementFieldImageFilter::GenerateData() // the KernelBased spline. this->PrepareKernelBaseSpline(); - itkDebugMacro(<< "Actually executing"); + itkDebugMacro("Actually executing"); // Get the output pointers OutputImageType * outputPtr = this->GetOutput(); diff --git a/Modules/Filtering/DisplacementField/include/itkLandmarkDisplacementFieldSource.hxx b/Modules/Filtering/DisplacementField/include/itkLandmarkDisplacementFieldSource.hxx index 1febbf491fe..121e57522fc 100644 --- a/Modules/Filtering/DisplacementField/include/itkLandmarkDisplacementFieldSource.hxx +++ b/Modules/Filtering/DisplacementField/include/itkLandmarkDisplacementFieldSource.hxx @@ -89,11 +89,11 @@ LandmarkDisplacementFieldSource::PrepareKernelBaseSpline() m_KernelTransform->GetModifiableTargetLandmarks()->SetPoints(targets); m_KernelTransform->GetModifiableSourceLandmarks()->SetPoints(sources); - itkDebugMacro(<< "Before ComputeWMatrix() "); + itkDebugMacro("Before ComputeWMatrix() "); m_KernelTransform->ComputeWMatrix(); - itkDebugMacro(<< "After ComputeWMatrix() "); + itkDebugMacro("After ComputeWMatrix() "); } /** @@ -107,7 +107,7 @@ LandmarkDisplacementFieldSource::GenerateData() // the KernelBased spline. this->PrepareKernelBaseSpline(); - itkDebugMacro(<< "Actually executing"); + itkDebugMacro("Actually executing"); // Get the output pointers OutputImageType * outputPtr = this->GetOutput(); diff --git a/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.hxx index 31301712e8d..942a3ab54c0 100644 --- a/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkDanielssonDistanceMapImageFilter.hxx @@ -89,7 +89,7 @@ template void DanielssonDistanceMapImageFilter::PrepareData() { - itkDebugMacro(<< "PrepareData Start"); + itkDebugMacro("PrepareData Start"); VoronoiImagePointer voronoiMap = this->GetVoronoiMap(); InputImagePointer inputImage = dynamic_cast(ProcessObject::GetInput(0)); @@ -129,7 +129,7 @@ DanielssonDistanceMapImageFilter::Prep ImageRegionConstIteratorWithIndex it(inputImage, region); ImageRegionIteratorWithIndex ot(voronoiMap, region); - itkDebugMacro(<< "PrepareData: Copy input to output"); + itkDebugMacro("PrepareData: Copy input to output"); if (m_InputIsBinary) { VoronoiPixelType npt = 1; @@ -178,7 +178,7 @@ DanielssonDistanceMapImageFilter::Prep minValue[j] = 0; } - itkDebugMacro(<< "PrepareData: Copy output to ct"); + itkDebugMacro("PrepareData: Copy output to ct"); // Iterate over the input image and distanceComponents image. // Wherever the input image is non-zero, initialize the distanceComponents image to the minValue. @@ -197,14 +197,14 @@ DanielssonDistanceMapImageFilter::Prep ++it; ++ct; } - itkDebugMacro(<< "PrepareData End"); + itkDebugMacro("PrepareData End"); } template void DanielssonDistanceMapImageFilter::ComputeVoronoiMap() { - itkDebugMacro(<< "ComputeVoronoiMap Start"); + itkDebugMacro("ComputeVoronoiMap Start"); VoronoiImagePointer voronoiMap = this->GetVoronoiMap(); OutputImagePointer distanceMap = this->GetDistanceMap(); VectorImagePointer distanceComponents = this->GetVectorDistanceMap(); @@ -215,7 +215,7 @@ DanielssonDistanceMapImageFilter::Comp ImageRegionIteratorWithIndex ct(distanceComponents, region); ImageRegionIteratorWithIndex dt(distanceMap, region); - itkDebugMacro(<< "ComputeVoronoiMap Region: " << region); + itkDebugMacro("ComputeVoronoiMap Region: " << region); while (!ot.IsAtEnd()) { IndexType index = ct.GetIndex() + ct.Get(); @@ -254,7 +254,7 @@ DanielssonDistanceMapImageFilter::Comp ++ct; ++dt; } - itkDebugMacro(<< "ComputeVoronoiMap End"); + itkDebugMacro("ComputeVoronoiMap End"); } template @@ -307,7 +307,7 @@ DanielssonDistanceMapImageFilter::Gene RegionType region = voronoiMap->GetRequestedRegion(); - itkDebugMacro(<< "Region to process: " << region); + itkDebugMacro("Region to process: " << region); // Instantiate reflective iterator @@ -359,7 +359,7 @@ DanielssonDistanceMapImageFilter::Gene SizeValueType i = 0; - itkDebugMacro(<< "GenerateData: Computing distance transform"); + itkDebugMacro("GenerateData: Computing distance transform"); while (!it.IsAtEnd()) { if (!(i % updateVisits)) @@ -399,7 +399,7 @@ DanielssonDistanceMapImageFilter::Gene ++inputIt; } - itkDebugMacro(<< "GenerateData: ComputeVoronoiMap"); + itkDebugMacro("GenerateData: ComputeVoronoiMap"); this->ComputeVoronoiMap(); } diff --git a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.hxx b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.hxx index 41a5c6af7b3..72327f471f2 100644 --- a/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.hxx +++ b/Modules/Filtering/GPUImageFilterBase/include/itkGPUCastImageFilter.hxx @@ -53,9 +53,9 @@ template void GPUCastImageFilter::GPUGenerateData() { - itkDebugMacro(<< "Calling GPUCastImageFilter::GPUGenerateData()"); + itkDebugMacro("Calling GPUCastImageFilter::GPUGenerateData()"); GPUSuperclass::GPUGenerateData(); - itkDebugMacro(<< "GPUCastImageFilter::GPUGenerateData() finished"); + itkDebugMacro("GPUCastImageFilter::GPUGenerateData() finished"); } diff --git a/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.hxx index 7a9b339513a..184d0174c9c 100644 --- a/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.hxx @@ -39,7 +39,7 @@ template void Hessian3DToVesselnessMeasureImageFilter::GenerateData() { - itkDebugMacro(<< "Hessian3DToVesselnessMeasureImageFilter generating data "); + itkDebugMacro("Hessian3DToVesselnessMeasureImageFilter generating data "); m_SymmetricEigenValueFilter->SetInput(this->GetInput()); diff --git a/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.hxx index 28beca53d2b..7e30ca27597 100644 --- a/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkHessianRecursiveGaussianImageFilter.hxx @@ -147,7 +147,7 @@ template void HessianRecursiveGaussianImageFilter::GenerateData() { - itkDebugMacro(<< "HessianRecursiveGaussianImageFilter generating data "); + itkDebugMacro("HessianRecursiveGaussianImageFilter generating data "); // Create a process accumulator for tracking the progress of this // minipipeline diff --git a/Modules/Filtering/ImageFeature/include/itkLaplacianRecursiveGaussianImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkLaplacianRecursiveGaussianImageFilter.hxx index 435edaac27d..3c4edf6d2d4 100644 --- a/Modules/Filtering/ImageFeature/include/itkLaplacianRecursiveGaussianImageFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkLaplacianRecursiveGaussianImageFilter.hxx @@ -112,7 +112,7 @@ template void LaplacianRecursiveGaussianImageFilter::GenerateData() { - itkDebugMacro(<< "LaplacianRecursiveGaussianImageFilter generating data "); + itkDebugMacro("LaplacianRecursiveGaussianImageFilter generating data "); // Set the number of threads on all the filters for (unsigned int i = 0; i < ImageDimension - 1; ++i) diff --git a/Modules/Filtering/ImageFeature/include/itkMultiScaleHessianBasedMeasureImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkMultiScaleHessianBasedMeasureImageFilter.hxx index 3303c2199dc..73052deab09 100644 --- a/Modules/Filtering/ImageFeature/include/itkMultiScaleHessianBasedMeasureImageFilter.hxx +++ b/Modules/Filtering/ImageFeature/include/itkMultiScaleHessianBasedMeasureImageFilter.hxx @@ -182,7 +182,7 @@ MultiScaleHessianBasedMeasureImageFilterComputeSigmaValue(scaleLevel); - itkDebugMacro(<< "Computing measure for scale with sigma = " << sigma); + itkDebugMacro("Computing measure for scale with sigma = " << sigma); m_HessianFilter->SetSigma(sigma); diff --git a/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.hxx b/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.hxx index 59a5b2e9c93..ba0db676505 100644 --- a/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.hxx +++ b/Modules/Filtering/ImageGradient/include/itkDifferenceOfGaussiansGradientImageFilter.hxx @@ -27,7 +27,7 @@ namespace itk template DifferenceOfGaussiansGradientImageFilter::DifferenceOfGaussiansGradientImageFilter() { - itkDebugMacro(<< "DifferenceOfGaussiansGradientImageFilter::DifferenceOfGaussiansGradientImageFilter() called"); + itkDebugMacro("DifferenceOfGaussiansGradientImageFilter::DifferenceOfGaussiansGradientImageFilter() called"); m_Width = 2; } @@ -36,7 +36,7 @@ template void DifferenceOfGaussiansGradientImageFilter::GenerateData() { - itkDebugMacro(<< "DifferenceOfGaussiansGradientImageFilter::GenerateData() called"); + itkDebugMacro("DifferenceOfGaussiansGradientImageFilter::GenerateData() called"); // Get the input and output pointers typename Superclass::InputImagePointer inputPtr = const_cast(this->GetInput(0)); @@ -128,7 +128,7 @@ DifferenceOfGaussiansGradientImageFilter::GenerateData() progress.CompletedPixel(); } - itkDebugMacro(<< "DifferenceOfGaussiansGradientImageFilter::GenerateData() finished"); + itkDebugMacro("DifferenceOfGaussiansGradientImageFilter::GenerateData() finished"); } template diff --git a/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.hxx b/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.hxx index 29664fa7b62..6df895b9717 100644 --- a/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.hxx +++ b/Modules/Filtering/ImageGradient/include/itkGradientMagnitudeRecursiveGaussianImageFilter.hxx @@ -174,7 +174,7 @@ template void GradientMagnitudeRecursiveGaussianImageFilter::GenerateData() { - itkDebugMacro(<< "GradientMagnitudeRecursiveGaussianImageFilter generating data "); + itkDebugMacro("GradientMagnitudeRecursiveGaussianImageFilter generating data "); const typename TInputImage::ConstPointer inputImage(this->GetInput()); diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.hxx index 6b35114a913..b313ca67747 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineDownsampleImageFilter.hxx @@ -34,7 +34,7 @@ template void BSplineDownsampleImageFilter::GenerateData() { - itkDebugMacro(<< "Actually executing"); + itkDebugMacro("Actually executing"); // Get the input and output pointers InputImagePointer inputPtr = const_cast(this->GetInput()); diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.hxx index 5a05e5f7ae5..1b450ca497b 100644 --- a/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBSplineUpsampleImageFilter.hxx @@ -45,7 +45,7 @@ template void BSplineUpsampleImageFilter::GenerateData() { - itkDebugMacro(<< "Actually executing"); + itkDebugMacro("Actually executing"); // Get the input and output pointers InputImagePointer inputPtr = const_cast(this->GetInput()); diff --git a/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.hxx index b2ad90fac3a..d4c1ab27682 100644 --- a/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkBinShrinkImageFilter.hxx @@ -98,7 +98,7 @@ void BinShrinkImageFilter::DynamicThreadedGenerateData( const OutputImageRegionType & outputRegionForThread) { - itkDebugMacro(<< "BinShrinkImageFilter executing on region:" << outputRegionForThread); + itkDebugMacro("BinShrinkImageFilter executing on region:" << outputRegionForThread); const InputImageType * inputPtr = this->GetInput(); OutputImageType * outputPtr = this->GetOutput(); diff --git a/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx index c46bbbb9e01..22df164ef6d 100644 --- a/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkMirrorPadImageFilter.hxx @@ -632,7 +632,7 @@ MirrorPadImageFilter::DynamicThreadedGenerateData( int goodInput, goodOutput; // Are the regions non-empty? - itkDebugMacro(<< "MirrorPadImageFilter::DynamicThreadedGenerateData"); + itkDebugMacro("MirrorPadImageFilter::DynamicThreadedGenerateData"); // Get the input and output pointers const InputImageType * inputPtr = this->GetInput(); diff --git a/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx index e41129cf898..43f8701267b 100644 --- a/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx +++ b/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx @@ -543,7 +543,7 @@ OrientImageFilter::GenerateData() } else { - itkDebugMacro(<< "No need to flip"); + itkDebugMacro("No need to flip"); } // diff --git a/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.hxx b/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.hxx index e06d03bc7fd..f2526e5687e 100644 --- a/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.hxx +++ b/Modules/Filtering/ImageIntensity/include/itkPolylineMask2DImageFilter.hxx @@ -127,7 +127,7 @@ PolylineMask2DImageFilter::GenerateData() ImageLineIteratorType imit(outputImagePtr, outputImagePtr->GetLargestPossibleRegion()); imit.SetDirection(0); - itkDebugMacro(<< "Generating the mask defined by the polyline....."); + itkDebugMacro("Generating the mask defined by the polyline....."); while (piter != container->End()) { diff --git a/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.hxx b/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.hxx index 207e5d9a3c6..fad5a9a7567 100644 --- a/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.hxx +++ b/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.hxx @@ -88,15 +88,15 @@ PolylineMaskImageFilter::Generate nViewVector = m_ViewVector; nViewVector.Normalize(); - itkDebugMacro(<< "Normalized Up vector" << nUpVector); - itkDebugMacro(<< "Normalized View vector" << nViewVector); + itkDebugMacro("Normalized Up vector" << nUpVector); + itkDebugMacro("Normalized View vector" << nViewVector); // Orthogonalize nUpVector and nViewVector TVector nOrthogonalVector; nOrthogonalVector = nUpVector - (nViewVector * (nUpVector * nViewVector)); - itkDebugMacro(<< "Up vector component orthogonal to View vector " << nOrthogonalVector); + itkDebugMacro("Up vector component orthogonal to View vector " << nOrthogonalVector); // Perform the cross product and determine a third coordinate axis // orthogonal to both nOrthogonalVector and nViewVector. @@ -104,7 +104,7 @@ PolylineMaskImageFilter::Generate TVector nThirdAxis; nThirdAxis = itk::CrossProduct(nOrthogonalVector, nViewVector); - itkDebugMacro(<< "Third basis vector" << nThirdAxis); + itkDebugMacro("Third basis vector" << nThirdAxis); // Populate the rotation matrix using the unit vectors of the // camera reference coordinate system. @@ -292,7 +292,7 @@ PolylineMaskImageFilter::Generate } const BoundingBoxType::BoundsArrayType & bounds = boundingBox->GetBounds(); - itkDebugMacro(<< "Projection image bounding box=" << bounds); + itkDebugMacro("Projection image bounding box=" << bounds); ProjectionImageIndexType projectionStart; projectionStart[0] = 0; @@ -323,9 +323,9 @@ PolylineMaskImageFilter::Generate projectionImagePtr->SetSpacing(spacing); - itkDebugMacro(<< "Projection image size:" << projectionSize); - itkDebugMacro(<< "Projection image start index:" << projectionStart); - itkDebugMacro(<< "Projection image origin:" << origin); + itkDebugMacro("Projection image size:" << projectionSize); + itkDebugMacro("Projection image start index:" << projectionStart); + itkDebugMacro("Projection image origin:" << origin); projectionImagePtr->SetRegions(projectionRegion); projectionImagePtr->Allocate(true); // initialize buffer to zero @@ -333,7 +333,7 @@ PolylineMaskImageFilter::Generate using ProjectionImageIteratorType = ImageRegionIterator; ProjectionImageIteratorType projectionIt(projectionImagePtr, projectionImagePtr->GetLargestPossibleRegion()); - itkDebugMacro(<< "Rotation matrix" << m_RotationMatrix); + itkDebugMacro("Rotation matrix" << m_RotationMatrix); const VertexListType * container = polylinePtr->GetVertexList(); @@ -386,7 +386,7 @@ PolylineMaskImageFilter::Generate pflag = true; } - itkDebugMacro(<< "Polyline:" << startImageIndex << ',' << endImageIndex); + itkDebugMacro("Polyline:" << startImageIndex << ',' << endImageIndex); LineIteratorType it(projectionImagePtr, startImageIndex, endImageIndex); it.GoToBegin(); diff --git a/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx b/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx index d263dd2f29f..4ec6406d4b9 100644 --- a/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx +++ b/Modules/Filtering/ImageStatistics/include/itkImagePCADecompositionCalculator.hxx @@ -37,7 +37,7 @@ template void ImagePCADecompositionCalculator::SetBasisImages(const BasisImagePointerVector & v) { - itkDebugMacro(<< "setting BasisImages"); + itkDebugMacro("setting BasisImages"); this->m_BasisMatrixCalculated = false; // We need this modified setter function so that the calculator // can cache the basis set between calculations. Note that computing the diff --git a/Modules/Filtering/Path/include/itkPathToImageFilter.hxx b/Modules/Filtering/Path/include/itkPathToImageFilter.hxx index 13fa04279d2..e0ec2de8013 100644 --- a/Modules/Filtering/Path/include/itkPathToImageFilter.hxx +++ b/Modules/Filtering/Path/include/itkPathToImageFilter.hxx @@ -186,7 +186,7 @@ PathToImageFilter::GenerateData() { unsigned int i; - itkDebugMacro(<< "PathToImageFilter::GenerateData() called"); + itkDebugMacro("PathToImageFilter::GenerateData() called"); // Get the input and output pointers const InputPathType * InputPath = this->GetInput(); @@ -275,7 +275,7 @@ PathToImageFilter::GenerateData() pathIt.Set(m_PathValue); } - itkDebugMacro(<< "PathToImageFilter::GenerateData() finished"); + itkDebugMacro("PathToImageFilter::GenerateData() finished"); } template diff --git a/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.hxx b/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.hxx index b66cc524d2b..aa27f2f586b 100644 --- a/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.hxx +++ b/Modules/Filtering/Smoothing/include/itkBinomialBlurImageFilter.hxx @@ -29,7 +29,7 @@ namespace itk template BinomialBlurImageFilter::BinomialBlurImageFilter() { - itkDebugMacro(<< "BinomialBlurImageFilter::BinomialBlurImageFilter() called"); + itkDebugMacro("BinomialBlurImageFilter::BinomialBlurImageFilter() called"); // The default is to just do one repetition m_Repetitions = 1; @@ -39,7 +39,7 @@ template void BinomialBlurImageFilter::GenerateInputRequestedRegion() { - itkDebugMacro(<< "BinomialBlurImageFilter::GenerateInputRequestedRegion() called"); + itkDebugMacro("BinomialBlurImageFilter::GenerateInputRequestedRegion() called"); Superclass::GenerateInputRequestedRegion(); @@ -95,7 +95,7 @@ template void BinomialBlurImageFilter::GenerateData() { - itkDebugMacro(<< "BinomialBlurImageFilter::GenerateData() called"); + itkDebugMacro("BinomialBlurImageFilter::GenerateData() called"); // Get the input and output pointers InputImageConstPointer inputPtr = this->GetInput(0); @@ -151,7 +151,7 @@ BinomialBlurImageFilter::GenerateData() // walk the output image forwards and compute blur for (unsigned int rep = 0; rep < m_Repetitions; ++rep) { - itkDebugMacro(<< "Repetition #" << rep); + itkDebugMacro("Repetition #" << rep); // blur each dimension for (unsigned int dim = 0; dim < NDimensions; ++dim) @@ -192,7 +192,7 @@ BinomialBlurImageFilter::GenerateData() ++tempItDir; } // end walk the image forwards - itkDebugMacro(<< "End processing forward dimension " << dim); + itkDebugMacro("End processing forward dimension " << dim); //----------------------Reverse pass---------------------- TempReverseIterator tempReverseIt(tempPtr, tempPtr->GetRequestedRegion()); diff --git a/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.hxx b/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.hxx index ded9ea6e25e..a09344b49b9 100644 --- a/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.hxx +++ b/Modules/Filtering/Smoothing/include/itkSmoothingRecursiveGaussianImageFilter.hxx @@ -200,7 +200,7 @@ template void SmoothingRecursiveGaussianImageFilter::GenerateData() { - itkDebugMacro(<< "SmoothingRecursiveGaussianImageFilter generating data "); + itkDebugMacro("SmoothingRecursiveGaussianImageFilter generating data "); const typename TInputImage::ConstPointer inputImage(this->GetInput()); diff --git a/Modules/Filtering/SpatialFunction/include/itkSpatialFunctionImageEvaluatorFilter.hxx b/Modules/Filtering/SpatialFunction/include/itkSpatialFunctionImageEvaluatorFilter.hxx index a0ae7cc9975..28859af9398 100644 --- a/Modules/Filtering/SpatialFunction/include/itkSpatialFunctionImageEvaluatorFilter.hxx +++ b/Modules/Filtering/SpatialFunction/include/itkSpatialFunctionImageEvaluatorFilter.hxx @@ -25,7 +25,7 @@ namespace itk template SpatialFunctionImageEvaluatorFilter::SpatialFunctionImageEvaluatorFilter() { - itkDebugMacro(<< "SpatialFunctionImageEvaluatorFilter::SpatialFunctionImageEvaluatorFilter() called"); + itkDebugMacro("SpatialFunctionImageEvaluatorFilter::SpatialFunctionImageEvaluatorFilter() called"); // Set the internal function to null this->m_PixelFunction = nullptr; @@ -35,7 +35,7 @@ template ::GenerateData() { - itkDebugMacro(<< "SpatialFunctionImageEvaluatorFilter::GenerateData() called"); + itkDebugMacro("SpatialFunctionImageEvaluatorFilter::GenerateData() called"); // Allocate the output image typename TOutputImage::Pointer outputPtr = this->GetOutput(); @@ -66,7 +66,7 @@ SpatialFunctionImageEvaluatorFilter outIt.Set((PixelType)value); } - itkDebugMacro(<< "SpatialFunctionImageEvaluatorFilter::GenerateData() finished"); + itkDebugMacro("SpatialFunctionImageEvaluatorFilter::GenerateData() finished"); } template diff --git a/Modules/IO/BMP/src/itkBMPImageIO.cxx b/Modules/IO/BMP/src/itkBMPImageIO.cxx index 1200a2d8693..31ae8b11e41 100644 --- a/Modules/IO/BMP/src/itkBMPImageIO.cxx +++ b/Modules/IO/BMP/src/itkBMPImageIO.cxx @@ -60,7 +60,7 @@ BMPImageIO::CanReadFile(const char * filename) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); } @@ -68,7 +68,7 @@ BMPImageIO::CanReadFile(const char * filename) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); } // Now check the content @@ -153,14 +153,14 @@ BMPImageIO::CanWriteFile(const char * name) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); } bool extensionFound = this->HasSupportedWriteExtension(name, false); if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } diff --git a/Modules/IO/BioRad/src/itkBioRadImageIO.cxx b/Modules/IO/BioRad/src/itkBioRadImageIO.cxx index 9f02ae29ef2..c885fb00201 100644 --- a/Modules/IO/BioRad/src/itkBioRadImageIO.cxx +++ b/Modules/IO/BioRad/src/itkBioRadImageIO.cxx @@ -137,7 +137,7 @@ BioRadImageIO::CanReadFile(const char * filename) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -146,7 +146,7 @@ BioRadImageIO::CanReadFile(const char * filename) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } @@ -165,7 +165,7 @@ BioRadImageIO::CanReadFile(const char * filename) file.read((char *)(&file_id), 2); ByteSwapper::SwapFromSystemToLittleEndian(&file_id); - itkDebugMacro(<< "Magic number: " << file_id); + itkDebugMacro("Magic number: " << file_id); file.close(); return file_id == BIORAD_MAGIC_NUMBER; @@ -379,7 +379,7 @@ BioRadImageIO::CanWriteFile(const char * name) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -387,7 +387,7 @@ BioRadImageIO::CanWriteFile(const char * name) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } diff --git a/Modules/IO/CSV/src/itkCSVFileReaderBase.cxx b/Modules/IO/CSV/src/itkCSVFileReaderBase.cxx index e2295622a33..9792ec6badc 100644 --- a/Modules/IO/CSV/src/itkCSVFileReaderBase.cxx +++ b/Modules/IO/CSV/src/itkCSVFileReaderBase.cxx @@ -203,7 +203,7 @@ CSVFileReaderBase::GetNextField(std::string & str) std::string empty; // Check that we are not at the end of the file - itkDebugMacro(<< "m_Line: " << m_Line); + itkDebugMacro("m_Line: " << m_Line); if (!this->m_InputStream.eof()) { bool OnANewLine = false; diff --git a/Modules/IO/DCMTK/src/itkDCMTKImageIO.cxx b/Modules/IO/DCMTK/src/itkDCMTKImageIO.cxx index 9aebc33bd57..06da115975f 100644 --- a/Modules/IO/DCMTK/src/itkDCMTKImageIO.cxx +++ b/Modules/IO/DCMTK/src/itkDCMTKImageIO.cxx @@ -214,7 +214,7 @@ DCMTKImageIO::CanReadFile(const char * filename) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); } #if !defined(__EMSCRIPTEN__) diff --git a/Modules/IO/GDCM/src/itkGDCMImageIO.cxx b/Modules/IO/GDCM/src/itkGDCMImageIO.cxx index dee53815ded..20b551e4713 100644 --- a/Modules/IO/GDCM/src/itkGDCMImageIO.cxx +++ b/Modules/IO/GDCM/src/itkGDCMImageIO.cxx @@ -813,7 +813,7 @@ GDCMImageIO::CanWriteFile(const char * name) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -1001,7 +1001,7 @@ GDCMImageIO::Write(const void * buffer) } else { - itkDebugMacro(<< "GDCMImageIO: non-DICOM and non-ITK standard key = " << key); + itkDebugMacro("GDCMImageIO: non-DICOM and non-ITK standard key = " << key); } } diff --git a/Modules/IO/GDCM/src/itkGDCMSeriesFileNames.cxx b/Modules/IO/GDCM/src/itkGDCMSeriesFileNames.cxx index 980740ef31a..a193551719d 100644 --- a/Modules/IO/GDCM/src/itkGDCMSeriesFileNames.cxx +++ b/Modules/IO/GDCM/src/itkGDCMSeriesFileNames.cxx @@ -170,7 +170,7 @@ GDCMSeriesFileNames::GetFileNames(const std::string serie) } else { - itkDebugMacro(<< "No files were found"); + itkDebugMacro("No files were found"); } return m_InputFileNames; @@ -197,7 +197,7 @@ GDCMSeriesFileNames::GetOutputFileNames() if (m_OutputDirectory.empty()) { - itkDebugMacro(<< "No output directory was specified"); + itkDebugMacro("No output directory was specified"); return m_OutputFileNames; } @@ -256,7 +256,7 @@ GDCMSeriesFileNames::GetOutputFileNames() } else { - itkDebugMacro(<< "No files were found."); + itkDebugMacro("No files were found."); } return m_OutputFileNames; diff --git a/Modules/IO/GIPL/src/itkGiplImageIO.cxx b/Modules/IO/GIPL/src/itkGiplImageIO.cxx index bc326986b07..d9841cbc8ef 100644 --- a/Modules/IO/GIPL/src/itkGiplImageIO.cxx +++ b/Modules/IO/GIPL/src/itkGiplImageIO.cxx @@ -105,7 +105,7 @@ GiplImageIO::CanReadFile(const char * filename) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } @@ -183,14 +183,14 @@ GiplImageIO::CanWriteFile(const char * name) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); } bool extensionFound = CheckExtension(name); if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } @@ -1108,7 +1108,7 @@ GiplImageIO::CheckExtension(const char * filename) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } diff --git a/Modules/IO/ImageBase/include/itkImageFileReader.hxx b/Modules/IO/ImageBase/include/itkImageFileReader.hxx index d4a5bf8ec94..f690a457e98 100644 --- a/Modules/IO/ImageBase/include/itkImageFileReader.hxx +++ b/Modules/IO/ImageBase/include/itkImageFileReader.hxx @@ -74,7 +74,7 @@ ImageFileReader::GenerateOutputInformation() { typename TOutputImage::Pointer output = this->GetOutput(); - itkDebugMacro(<< "Reading file for GenerateOutputInformation()" << this->GetFileName()); + itkDebugMacro("Reading file for GenerateOutputInformation()" << this->GetFileName()); // Check to see if we can read the file given the name or prefix // @@ -291,7 +291,7 @@ template void ImageFileReader::EnlargeOutputRequestedRegion(DataObject * output) { - itkDebugMacro(<< "Starting EnlargeOutputRequestedRegion() "); + itkDebugMacro("Starting EnlargeOutputRequestedRegion() "); typename TOutputImage::Pointer out = dynamic_cast(output); typename TOutputImage::RegionType largestRegion = out->GetLargestPossibleRegion(); ImageRegionType streamableRegion; @@ -341,8 +341,8 @@ ImageFileReader::EnlargeOutputRequestedRegion( throw e; } - itkDebugMacro(<< "RequestedRegion is set to:" << streamableRegion - << " while the m_ActualIORegion is: " << m_ActualIORegion); + itkDebugMacro("RequestedRegion is set to:" << streamableRegion + << " while the m_ActualIORegion is: " << m_ActualIORegion); out->SetRequestedRegion(streamableRegion); } @@ -355,7 +355,7 @@ ImageFileReader::GenerateData() typename TOutputImage::Pointer output = this->GetOutput(); - itkDebugMacro(<< "ImageFileReader::GenerateData() \n" + itkDebugMacro("ImageFileReader::GenerateData() \n" << "Allocating the buffer with the EnlargedRequestedRegion \n" << output->GetRequestedRegion() << '\n'); @@ -381,7 +381,7 @@ ImageFileReader::GenerateData() // Tell the ImageIO to read the file m_ImageIO->SetFileName(this->GetFileName().c_str()); - itkDebugMacro(<< "Setting imageIO IORegion to: " << m_ActualIORegion); + itkDebugMacro("Setting imageIO IORegion to: " << m_ActualIORegion); m_ImageIO->SetIORegion(m_ActualIORegion); // the size of the buffer is computed based on the actual number of @@ -396,7 +396,7 @@ ImageFileReader::GenerateData() { // the pixel types don't match so a type conversion needs to be // performed - itkDebugMacro(<< "Buffer conversion required from: " + itkDebugMacro("Buffer conversion required from: " << m_ImageIO->GetComponentTypeAsString(m_ImageIO->GetComponentType()) << " to: " << m_ImageIO->GetComponentTypeAsString(ioType) << " ConvertPixelTraits::NumComponents " << ConvertPixelTraits::GetNumberOfComponents() << " m_ImageIO->NumComponents " @@ -416,7 +416,7 @@ ImageFileReader::GenerateData() // requested to not match, the dimensions of the two regions may // be different, therefore we buffer and copy the pixels - itkDebugMacro(<< "Buffer required because file dimension is greater then image dimension"); + itkDebugMacro("Buffer required because file dimension is greater then image dimension"); OutputImagePixelType * outputBuffer = output->GetPixelContainer()->GetBufferPointer(); @@ -431,7 +431,7 @@ ImageFileReader::GenerateData() } else { - itkDebugMacro(<< "No buffer conversion required."); + itkDebugMacro("No buffer conversion required."); OutputImagePixelType * outputBuffer = output->GetPixelContainer()->GetBufferPointer(); m_ImageIO->Read(outputBuffer); diff --git a/Modules/IO/ImageBase/include/itkImageFileWriter.hxx b/Modules/IO/ImageBase/include/itkImageFileWriter.hxx index 7f1035fb2bc..b318585d582 100644 --- a/Modules/IO/ImageBase/include/itkImageFileWriter.hxx +++ b/Modules/IO/ImageBase/include/itkImageFileWriter.hxx @@ -81,7 +81,7 @@ ImageFileWriter::Write() { const InputImageType * input = this->GetInput(); - itkDebugMacro(<< "Writing an image file"); + itkDebugMacro("Writing an image file"); // Make sure input is available if (input == nullptr) @@ -101,12 +101,12 @@ ImageFileWriter::Write() // try creating via factory if (m_ImageIO.IsNull()) { - itkDebugMacro(<< "Attempting factory creation of ImageIO for file: " << m_FileName); + itkDebugMacro("Attempting factory creation of ImageIO for file: " << m_FileName); } else // ( m_FactorySpecifiedImageIO && !m_ImageIO->CanWriteFile( m_FileName.c_str() ) { - itkDebugMacro(<< "ImageIO exists but doesn't know how to write file:" << m_FileName); - itkDebugMacro(<< "Attempting creation of ImageIO with a factory for file:" << m_FileName); + itkDebugMacro("ImageIO exists but doesn't know how to write file:" << m_FileName); + itkDebugMacro("Attempting creation of ImageIO with a factory for file:" << m_FileName); } m_ImageIO = ImageIOFactory::CreateImageIO(m_FileName.c_str(), ImageIOFactory::IOFileModeEnum::WriteMode); m_FactorySpecifiedImageIO = true; @@ -332,7 +332,7 @@ ImageFileWriter::GenerateData() InputImageRegionType largestRegion = input->GetLargestPossibleRegion(); InputImagePointer cacheImage; - itkDebugMacro(<< "Writing file: " << m_FileName); + itkDebugMacro("Writing file: " << m_FileName); // now extract the data as a raw buffer pointer const void * dataPtr = input->GetBufferPointer(); diff --git a/Modules/IO/ImageBase/include/itkImageSeriesWriter.hxx b/Modules/IO/ImageBase/include/itkImageSeriesWriter.hxx index 003e169cd89..4d82521de87 100644 --- a/Modules/IO/ImageBase/include/itkImageSeriesWriter.hxx +++ b/Modules/IO/ImageBase/include/itkImageSeriesWriter.hxx @@ -71,7 +71,7 @@ ImageSeriesWriter::Write() { const InputImageType * inputImage = this->GetInput(); - itkDebugMacro(<< "Writing an image file"); + itkDebugMacro("Writing an image file"); // Make sure input is available if (inputImage == nullptr) @@ -151,7 +151,7 @@ template void ImageSeriesWriter::GenerateData() { - itkDebugMacro(<< "Writing a series of files"); + itkDebugMacro("Writing a series of files"); if (m_FileNames.empty()) { // this method will be deprecated. It is here only to maintain the old API @@ -245,7 +245,7 @@ ImageSeriesWriter::WriteFiles() << " were expected "); } - itkDebugMacro(<< "Number of files to write = " << m_FileNames.size()); + itkDebugMacro("Number of files to write = " << m_FileNames.size()); ProgressReporter progress(this, 0, expectedNumberOfFiles, expectedNumberOfFiles); diff --git a/Modules/IO/ImageBase/src/itkImageIOBase.cxx b/Modules/IO/ImageBase/src/itkImageIOBase.cxx index a51ea6ed546..91f60816411 100644 --- a/Modules/IO/ImageBase/src/itkImageIOBase.cxx +++ b/Modules/IO/ImageBase/src/itkImageIOBase.cxx @@ -628,7 +628,7 @@ ImageIOBase::OpenFileForReading(std::ifstream & inputStream, const std::string & } // Open the new file for reading - itkDebugMacro(<< "Opening file for reading: " << filename); + itkDebugMacro("Opening file for reading: " << filename); std::ios::openmode mode = std::ios::in; if (!ascii) @@ -666,7 +666,7 @@ ImageIOBase::OpenFileForWriting(std::ofstream & outputStream, const std::string } // Open the new file for writing - itkDebugMacro(<< "Opening file for writing: " << filename); + itkDebugMacro("Opening file for writing: " << filename); std::ios::openmode mode = std::ios::out; if (truncate) diff --git a/Modules/IO/ImageBase/src/itkStreamingImageIOBase.cxx b/Modules/IO/ImageBase/src/itkStreamingImageIOBase.cxx index 34a618835dd..042b419818e 100644 --- a/Modules/IO/ImageBase/src/itkStreamingImageIOBase.cxx +++ b/Modules/IO/ImageBase/src/itkStreamingImageIOBase.cxx @@ -35,7 +35,7 @@ StreamingImageIOBase::PrintSelf(std::ostream & os, Indent indent) const bool StreamingImageIOBase::StreamReadBufferAsBinary(std::istream & file, void * _buffer) { - itkDebugMacro(<< "StreamingReadBufferAsBinary called"); + itkDebugMacro("StreamingReadBufferAsBinary called"); auto * buffer = static_cast(_buffer); // Offset into file @@ -68,8 +68,8 @@ StreamingImageIOBase::StreamReadBufferAsBinary(std::istream & file, void * _buff subDimensionQuantity *= this->GetDimensions(i); } - itkDebugMacro(<< "Reading " << sizeOfChunk << " of " << sizeOfRegion << " bytes for " << m_FileName << " at " - << dataPos + seekPos << " position in file"); + itkDebugMacro("Reading " << sizeOfChunk << " of " << sizeOfRegion << " bytes for " << m_FileName << " at " + << dataPos + seekPos << " position in file"); file.seekg(dataPos + seekPos, std::ios::beg); @@ -120,7 +120,7 @@ StreamingImageIOBase::ReadBufferAsBinary(std::istream & is, void * buffer, Strea { std::streamsize bytesToRead = bytesRemaining > maxChunk ? maxChunk : bytesRemaining; - itkDebugMacro(<< "Reading " << bytesToRead << " of " << bytesRemaining << " bytes for " << m_FileName); + itkDebugMacro("Reading " << bytesToRead << " of " << bytesRemaining << " bytes for " << m_FileName); is.read(static_cast(buffer), bytesToRead); @@ -147,7 +147,7 @@ StreamingImageIOBase::WriteBufferAsBinary(std::ostream & os, const void * buffer { SizeType bytesToWrite = bytesRemaining > maxChunk ? maxChunk : bytesRemaining; - itkDebugMacro(<< "Writing " << bytesToWrite << " of " << bytesRemaining << " bytes for " << m_FileName); + itkDebugMacro("Writing " << bytesToWrite << " of " << bytesRemaining << " bytes for " << m_FileName); os.write(static_cast(buffer), bytesToWrite); if (os.fail()) @@ -165,7 +165,7 @@ StreamingImageIOBase::WriteBufferAsBinary(std::ostream & os, const void * buffer bool StreamingImageIOBase::StreamWriteBufferAsBinary(std::ostream & file, const void * _buffer) { - itkDebugMacro(<< "StreamingWriteBufferAsBinary called"); + itkDebugMacro("StreamingWriteBufferAsBinary called"); const auto * buffer = static_cast(_buffer); // Offset into file @@ -203,8 +203,8 @@ StreamingImageIOBase::StreamWriteBufferAsBinary(std::ostream & file, const void // increment the buffer pointer buffer += sizeOfChunk; - itkDebugMacro(<< "Writing " << sizeOfChunk << " of " - << " ?? bytes for " << m_FileName << " at " << dataPos + seekPos << " position in file"); + itkDebugMacro("Writing " << sizeOfChunk << " of " + << " ?? bytes for " << m_FileName << " at " << dataPos + seekPos << " position in file"); if (file.fail()) { diff --git a/Modules/IO/JPEG/src/itkJPEGImageIO.cxx b/Modules/IO/JPEG/src/itkJPEGImageIO.cxx index 9b791848dde..38f4ecaa885 100644 --- a/Modules/IO/JPEG/src/itkJPEGImageIO.cxx +++ b/Modules/IO/JPEG/src/itkJPEGImageIO.cxx @@ -97,7 +97,7 @@ JPEGImageIO::CanReadFile(const char * file) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -105,7 +105,7 @@ JPEGImageIO::CanReadFile(const char * file) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } diff --git a/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx b/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx index 4475a396308..ac622c3d197 100644 --- a/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx +++ b/Modules/IO/JPEG2000/src/itkJPEG2000ImageIO.cxx @@ -109,7 +109,7 @@ JPEG2000ImageIO::PrintSelf(std::ostream & os, Indent indent) const bool JPEG2000ImageIO::CanReadFile(const char * filename) { - itkDebugMacro(<< "JPEG2000ImageIO::CanReadFile()"); + itkDebugMacro("JPEG2000ImageIO::CanReadFile()"); // // If the file exists, and have extension .j2k or jp2 or jpt, then we are good @@ -117,7 +117,7 @@ JPEG2000ImageIO::CanReadFile(const char * filename) // if (!itksys::SystemTools::FileExists(filename)) { - itkDebugMacro(<< "File doesn't exist"); + itkDebugMacro("File doesn't exist"); return false; } @@ -137,7 +137,7 @@ JPEG2000ImageIO::SetTileSize(int x, int y) void JPEG2000ImageIO::ReadImageInformation() { - itkDebugMacro(<< "ReadImageInformation()"); + itkDebugMacro("ReadImageInformation()"); FILE * l_file = fopen(this->m_FileName.c_str(), "rb"); @@ -257,7 +257,7 @@ JPEG2000ImageIO::ReadImageInformation() OPJ_UINT32 l_nb_tiles_x; OPJ_UINT32 l_nb_tiles_y; - itkDebugMacro(<< "Trying to read header now..."); + itkDebugMacro("Trying to read header now..."); bResult = opj_read_header(this->m_Internal->m_Dinfo, &l_image, @@ -293,7 +293,7 @@ JPEG2000ImageIO::ReadImageInformation() this->m_Internal->m_NumberOfTilesInY = l_nb_tiles_y; - itkDebugMacro(<< "Number of Components = " << l_image->numcomps); + itkDebugMacro("Number of Components = " << l_image->numcomps); this->SetNumberOfComponents(l_image->numcomps); if (l_image->comps[0].prec == 8) @@ -329,17 +329,17 @@ JPEG2000ImageIO::ReadImageInformation() this->SetPixelType(IOPixelEnum::VECTOR); } - itkDebugMacro(<< "bits per pixel = " << l_image->comps[0].prec); - itkDebugMacro(<< "Color space = " << l_image->color_space); - itkDebugMacro(<< "Tile Start X = " << this->m_Internal->m_TileStartX); - itkDebugMacro(<< "Tile Start Y = " << this->m_Internal->m_TileStartY); - itkDebugMacro(<< "Tile Width = " << this->m_Internal->m_TileWidth); - itkDebugMacro(<< "Tile Height = " << this->m_Internal->m_TileHeight); - itkDebugMacro(<< "Number of Tiles X = " << this->m_Internal->m_NumberOfTilesInX); - itkDebugMacro(<< "Number of Tiles Y = " << this->m_Internal->m_NumberOfTilesInY); + itkDebugMacro("bits per pixel = " << l_image->comps[0].prec); + itkDebugMacro("Color space = " << l_image->color_space); + itkDebugMacro("Tile Start X = " << this->m_Internal->m_TileStartX); + itkDebugMacro("Tile Start Y = " << this->m_Internal->m_TileStartY); + itkDebugMacro("Tile Width = " << this->m_Internal->m_TileWidth); + itkDebugMacro("Tile Height = " << this->m_Internal->m_TileHeight); + itkDebugMacro("Number of Tiles X = " << this->m_Internal->m_NumberOfTilesInX); + itkDebugMacro("Number of Tiles Y = " << this->m_Internal->m_NumberOfTilesInY); - itkDebugMacro(<< "image->x1 = " << l_image->x1); - itkDebugMacro(<< "image->y1 = " << l_image->y1); + itkDebugMacro("image->x1 = " << l_image->x1); + itkDebugMacro("image->y1 = " << l_image->y1); this->SetDimensions(0, l_image->x1); this->SetDimensions(1, l_image->y1); @@ -366,7 +366,7 @@ JPEG2000ImageIO::ReadImageInformation() void JPEG2000ImageIO::Read(void * buffer) { - itkDebugMacro(<< "JPEG2000ImageIO::Read() Begin"); + itkDebugMacro("JPEG2000ImageIO::Read() Begin"); FILE * l_file = fopen(this->m_FileName.c_str(), "rb"); @@ -493,15 +493,15 @@ JPEG2000ImageIO::Read(void * buffer) auto p_end_x = static_cast(startx + sizex); auto p_end_y = static_cast(starty + sizey); - itkDebugMacro(<< "opj_set_decode_area() before"); - itkDebugMacro(<< "p_start_x = " << p_start_x); - itkDebugMacro(<< "p_start_y = " << p_start_y); - itkDebugMacro(<< "p_end_x = " << p_end_x); - itkDebugMacro(<< "p_end_y = " << p_end_y); + itkDebugMacro("opj_set_decode_area() before"); + itkDebugMacro("p_start_x = " << p_start_x); + itkDebugMacro("p_start_y = " << p_start_y); + itkDebugMacro("p_end_x = " << p_end_x); + itkDebugMacro("p_end_y = " << p_end_y); bResult = opj_set_decode_area(this->m_Internal->m_Dinfo, p_start_x, p_start_y, p_end_x, p_end_y); - itkDebugMacro(<< "opj_set_decode_area() after"); + itkDebugMacro("opj_set_decode_area() after"); if (!bResult) { @@ -553,14 +553,14 @@ JPEG2000ImageIO::Read(void * buffer) << "Reason: opj_read_tile_header returns false"); } - itkDebugMacro(<< "l_tile_index " << l_tile_index); - itkDebugMacro(<< "l_data_size " << l_data_size); - itkDebugMacro(<< "l_current_tile_x0 " << l_current_tile_x0); - itkDebugMacro(<< "l_current_tile_y0 " << l_current_tile_y0); - itkDebugMacro(<< "l_current_tile_x1 " << l_current_tile_x1); - itkDebugMacro(<< "l_current_tile_y1 " << l_current_tile_y1); - itkDebugMacro(<< "l_nb_comps " << l_nb_comps); - itkDebugMacro(<< "l_go_on " << l_go_on); + itkDebugMacro("l_tile_index " << l_tile_index); + itkDebugMacro("l_data_size " << l_data_size); + itkDebugMacro("l_current_tile_x0 " << l_current_tile_x0); + itkDebugMacro("l_current_tile_y0 " << l_current_tile_y0); + itkDebugMacro("l_current_tile_x1 " << l_current_tile_x1); + itkDebugMacro("l_current_tile_y1 " << l_current_tile_y1); + itkDebugMacro("l_nb_comps " << l_nb_comps); + itkDebugMacro("l_go_on " << l_go_on); if (l_go_on) { @@ -578,7 +578,7 @@ JPEG2000ImageIO::Read(void * buffer) << "Reason: Error reallocating memory"); } - itkDebugMacro(<< "reallocated for " << l_data_size); + itkDebugMacro("reallocated for " << l_data_size); l_max_data_size = l_data_size; } @@ -606,8 +606,8 @@ JPEG2000ImageIO::Read(void * buffer) const SizeValueType sizePerComponentInBytes = l_data_size / (numberOfPixels * numberOfComponents); const SizeValueType sizePerChannelInBytes = l_data_size / (numberOfComponents); - itkDebugMacro(<< "sizePerComponentInBytes: " << sizePerComponentInBytes); - itkDebugMacro(<< "sizePerChannelInBytes: " << sizePerChannelInBytes); + itkDebugMacro("sizePerComponentInBytes: " << sizePerComponentInBytes); + itkDebugMacro("sizePerChannelInBytes: " << sizePerChannelInBytes); const SizeValueType sizePerStrideXInBytes = sizePerChannelInBytes / tsizey; const SizeValueType initialStrideInBytes = @@ -617,11 +617,11 @@ JPEG2000ImageIO::Read(void * buffer) const SizeValueType postStrideInBytes = (p_end_x - l_current_tile_x1) * sizePerComponentInBytes * numberOfComponents; - itkDebugMacro(<< "sizePerStrideYInBytes: " << sizePerChannelInBytes / tsizex); - itkDebugMacro(<< "sizePerStrideXInBytes: " << sizePerStrideXInBytes); - itkDebugMacro(<< "initialStrideInBytes: " << initialStrideInBytes); - itkDebugMacro(<< "priorStrideInBytes: " << priorStrideInBytes); - itkDebugMacro(<< "postStrideInBytes: " << postStrideInBytes); + itkDebugMacro("sizePerStrideYInBytes: " << sizePerChannelInBytes / tsizex); + itkDebugMacro("sizePerStrideXInBytes: " << sizePerStrideXInBytes); + itkDebugMacro("initialStrideInBytes: " << initialStrideInBytes); + itkDebugMacro("priorStrideInBytes: " << priorStrideInBytes); + itkDebugMacro("postStrideInBytes: " << postStrideInBytes); // TODO: Read the void buffer within the tile ROI. How do we specify the @@ -691,7 +691,7 @@ JPEG2000ImageIO::Read(void * buffer) free(l_data); } - itkDebugMacro(<< "JPEG2000ImageIO::Read() End"); + itkDebugMacro("JPEG2000ImageIO::Read() End"); } bool @@ -703,7 +703,7 @@ JPEG2000ImageIO::CanWriteFile(const char * filename) void JPEG2000ImageIO::WriteImageInformation() { - itkDebugMacro(<< "WriteImageInformation()"); + itkDebugMacro("WriteImageInformation()"); // the IORegion is not required to be set so we must use GetNumberOfDimensions if (this->GetNumberOfDimensions() != 2) @@ -737,7 +737,7 @@ JPEG2000ImageIO::WriteImageInformation() void JPEG2000ImageIO::Write(const void * buffer) { - itkDebugMacro(<< "Write() " << this->GetNumberOfComponents()); + itkDebugMacro("Write() " << this->GetNumberOfComponents()); bool bSuccess; @@ -910,7 +910,7 @@ JPEG2000ImageIO::Write(const void * buffer) // HERE, copy the buffer SizeValueType index = 0; SizeValueType numberOfPixels = SizeValueType(w) * SizeValueType(h); - itkDebugMacro(<< " START COPY BUFFER"); + itkDebugMacro(" START COPY BUFFER"); if (this->GetComponentType() == IOComponentEnum::UCHAR) { const auto * charBuffer = (const unsigned char *)buffer; @@ -936,7 +936,7 @@ JPEG2000ImageIO::Write(const void * buffer) ++index; } } - itkDebugMacro(<< " END COPY BUFFER"); + itkDebugMacro(" END COPY BUFFER"); //-------------------------------------------------------------------- opj_codec_t * cinfo = nullptr; @@ -1066,8 +1066,8 @@ RequestedRegion */ ImageIORegion JPEG2000ImageIO::GenerateStreamableReadRegionFromRequestedRegion(const ImageIORegion & requestedRegion) const { - itkDebugMacro(<< "JPEG2000ImageIO::GenerateStreamableReadRegionFromRequestedRegion()"); - itkDebugMacro(<< "Requested region = " << requestedRegion); + itkDebugMacro("JPEG2000ImageIO::GenerateStreamableReadRegionFromRequestedRegion()"); + itkDebugMacro("Requested region = " << requestedRegion); ImageIORegion streamableRegion(this->m_NumberOfDimensions); @@ -1084,7 +1084,7 @@ JPEG2000ImageIO::GenerateStreamableReadRegionFromRequestedRegion(const ImageIORe this->ComputeRegionInTileBoundaries(1, this->m_Internal->m_TileHeight, streamableRegion); } - itkDebugMacro(<< "Streamable region = " << streamableRegion); + itkDebugMacro("Streamable region = " << streamableRegion); return streamableRegion; } diff --git a/Modules/IO/LSM/src/itkLSMImageIO.cxx b/Modules/IO/LSM/src/itkLSMImageIO.cxx index b1d467bcc1b..ba63fccd637 100644 --- a/Modules/IO/LSM/src/itkLSMImageIO.cxx +++ b/Modules/IO/LSM/src/itkLSMImageIO.cxx @@ -123,14 +123,14 @@ LSMImageIO::CanReadFile(const char * filename) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } if (!this->HasSupportedReadExtension(filename)) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } @@ -269,7 +269,7 @@ LSMImageIO::Write(const void * buffer) TIFF * tif = TIFFOpen(m_FileName.c_str(), "w"); if (!tif) { - itkDebugMacro(<< "Returning"); + itkDebugMacro("Returning"); return; } @@ -354,7 +354,7 @@ LSMImageIO::Write(const void * buffer) { predictor = 2; TIFFSetField(tif, TIFFTAG_PREDICTOR, predictor); - itkDebugMacro(<< "LZW compression is patented outside US so it is disabled"); + itkDebugMacro("LZW compression is patented outside US so it is disabled"); } else if (compression == COMPRESSION_DEFLATE) { diff --git a/Modules/IO/MINC/src/itkMINCImageIO.cxx b/Modules/IO/MINC/src/itkMINCImageIO.cxx index a6710ffe4f1..5ba8eb3d149 100644 --- a/Modules/IO/MINC/src/itkMINCImageIO.cxx +++ b/Modules/IO/MINC/src/itkMINCImageIO.cxx @@ -91,7 +91,7 @@ MINCImageIO::CanReadFile(const char * name) { if (*name == 0) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -160,7 +160,7 @@ MINCImageIO::Read(void * buffer) volume_data_type = MI_TYPE_DOUBLE; break; default: - itkDebugMacro(<< "Could read datatype " << this->GetComponentType()); + itkDebugMacro("Could read datatype " << this->GetComponentType()); return; } @@ -893,7 +893,7 @@ MINCImageIO::CanWriteFile(const char * name) { if (name[0] == '\0') { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -1117,7 +1117,7 @@ MINCImageIO::WriteImageInformation() case 'V': if (nComp <= 1) { - itkDebugMacro(<< "Dimension order is incorrect " << dimension_order.c_str()); + itkDebugMacro("Dimension order is incorrect " << dimension_order.c_str()); dimorder_good = false; } else @@ -1129,7 +1129,7 @@ MINCImageIO::WriteImageInformation() case 'T': if (nComp <= 1) { - itkDebugMacro(<< "Dimension order is incorrect " << dimension_order.c_str()); + itkDebugMacro("Dimension order is incorrect " << dimension_order.c_str()); dimorder_good = false; } else @@ -1150,7 +1150,7 @@ MINCImageIO::WriteImageInformation() j = this->m_MINCPImpl->m_NDims - 1 - ((nComp > 1 ? 1 : 0) + 2); break; default: - itkDebugMacro(<< "Dimension order is incorrect " << dimension_order.c_str()); + itkDebugMacro("Dimension order is incorrect " << dimension_order.c_str()); dimorder_good = false; j = 0; break; @@ -1184,7 +1184,7 @@ MINCImageIO::WriteImageInformation() } else { - itkDebugMacro(<< "Dimension order is incorrect " << dimension_order.c_str()); + itkDebugMacro("Dimension order is incorrect " << dimension_order.c_str()); } } @@ -1329,7 +1329,7 @@ MINCImageIO::WriteImageInformation() } else { - itkDebugMacro(<< "Unsupported metadata type:" << tname); + itkDebugMacro("Unsupported metadata type:" << tname); } } else if (it->first == "history") diff --git a/Modules/IO/MRC/src/itkMRCImageIO.cxx b/Modules/IO/MRC/src/itkMRCImageIO.cxx index 4b062a4f3f9..ce9c38d159a 100644 --- a/Modules/IO/MRC/src/itkMRCImageIO.cxx +++ b/Modules/IO/MRC/src/itkMRCImageIO.cxx @@ -79,7 +79,7 @@ MRCImageIO::CanReadFile(const char * filename) return false; } - itkDebugMacro(<< "Reading Magic numbers " << filename); + itkDebugMacro("Reading Magic numbers " << filename); char map[4]; char stamp[4]; @@ -233,7 +233,7 @@ MRCImageIO::InternalReadImageInformation(std::ifstream & file) m_MRCHeader = MRCHeaderObject::New(); - itkDebugMacro(<< "Reading Information "); + itkDebugMacro("Reading Information "); this->OpenFileForReading(file, m_FileName); diff --git a/Modules/IO/MeshBase/include/itkMeshFileReader.hxx b/Modules/IO/MeshBase/include/itkMeshFileReader.hxx index b8908ab9571..11adb7c5c5c 100644 --- a/Modules/IO/MeshBase/include/itkMeshFileReader.hxx +++ b/Modules/IO/MeshBase/include/itkMeshFileReader.hxx @@ -355,7 +355,7 @@ MeshFileReader::Re { // the point pixel types don't match a type conversion needs to be // performed - itkDebugMacro(<< "Buffer conversion required from: " + itkDebugMacro("Buffer conversion required from: " << m_MeshIO->GetComponentTypeAsString(m_MeshIO->GetPointPixelComponentType()) << " to: " << m_MeshIO->GetComponentTypeAsString( MeshIOBase::MapComponentType::CType) @@ -372,7 +372,7 @@ MeshFileReader::Re } else { - itkDebugMacro(<< "No buffer conversion required."); + itkDebugMacro("No buffer conversion required."); m_MeshIO->ReadPointData(static_cast(outputPointDataBuffer.get())); } @@ -396,7 +396,7 @@ MeshFileReader::Re { // the cell pixel types don't match a type conversion needs to be // performed - itkDebugMacro(<< "Buffer conversion required from: " + itkDebugMacro("Buffer conversion required from: " << m_MeshIO->GetComponentTypeAsString(m_MeshIO->GetCellPixelComponentType()) << " to: " << m_MeshIO->GetComponentTypeAsString( MeshIOBase::MapComponentType::CType) @@ -413,7 +413,7 @@ MeshFileReader::Re } else { - itkDebugMacro(<< "No buffer conversion required."); + itkDebugMacro("No buffer conversion required."); m_MeshIO->ReadCellData(static_cast(outputCellDataBuffer.get())); } diff --git a/Modules/IO/MeshBase/include/itkMeshFileWriter.hxx b/Modules/IO/MeshBase/include/itkMeshFileWriter.hxx index 35032702612..1d7045cebde 100644 --- a/Modules/IO/MeshBase/include/itkMeshFileWriter.hxx +++ b/Modules/IO/MeshBase/include/itkMeshFileWriter.hxx @@ -72,7 +72,7 @@ MeshFileWriter::Write() { const InputMeshType * input = this->GetInput(); - itkDebugMacro(<< "Writing an mesh file"); + itkDebugMacro("Writing an mesh file"); // Make sure input is available if (input == nullptr) @@ -91,7 +91,7 @@ MeshFileWriter::Write() // Try creating via factory if (m_MeshIO.IsNull()) { - itkDebugMacro(<< "Attempting factory creation of MeshIO for file: " << m_FileName); + itkDebugMacro("Attempting factory creation of MeshIO for file: " << m_FileName); m_MeshIO = MeshIOFactory::CreateMeshIO(m_FileName.c_str(), MeshIOFactory::IOFileModeEnum::WriteMode); m_FactorySpecifiedMeshIO = true; } @@ -99,8 +99,8 @@ MeshFileWriter::Write() { if (m_FactorySpecifiedMeshIO && !m_MeshIO->CanWriteFile(m_FileName.c_str())) { - itkDebugMacro(<< "MeshIO exists but doesn't know how to write file:" << m_FileName); - itkDebugMacro(<< "Attempting creation of MeshIO with a factory for file:" << m_FileName); + itkDebugMacro("MeshIO exists but doesn't know how to write file:" << m_FileName); + itkDebugMacro("Attempting creation of MeshIO with a factory for file:" << m_FileName); m_MeshIO = MeshIOFactory::CreateMeshIO(m_FileName.c_str(), MeshIOFactory::IOFileModeEnum::WriteMode); m_FactorySpecifiedMeshIO = true; } @@ -248,7 +248,7 @@ MeshFileWriter::WritePoints() { const InputMeshType * input = this->GetInput(); - itkDebugMacro(<< "Writing points: " << m_FileName); + itkDebugMacro("Writing points: " << m_FileName); SizeValueType pointsBufferSize = input->GetNumberOfPoints() * TInputMesh::PointDimension; using ValueType = typename TInputMesh::PointType::ValueType; const auto buffer = make_unique_for_overwrite(pointsBufferSize); @@ -260,7 +260,7 @@ template void MeshFileWriter::WriteCells() { - itkDebugMacro(<< "Writing cells: " << m_FileName); + itkDebugMacro("Writing cells: " << m_FileName); SizeValueType cellsBufferSize = m_MeshIO->GetCellBufferSize(); using PointIdentifierType = typename TInputMesh::PointIdentifier; @@ -275,7 +275,7 @@ MeshFileWriter::WritePointData() { const InputMeshType * input = this->GetInput(); - itkDebugMacro(<< "Writing point data: " << m_FileName); + itkDebugMacro("Writing point data: " << m_FileName); if (input->GetPointData()->Size()) { @@ -296,7 +296,7 @@ MeshFileWriter::WriteCellData() { const InputMeshType * input = this->GetInput(); - itkDebugMacro(<< "Writing cell data: " << m_FileName); + itkDebugMacro("Writing cell data: " << m_FileName); if (input->GetCellData()->Size()) { diff --git a/Modules/IO/Meta/src/itkMetaImageIO.cxx b/Modules/IO/Meta/src/itkMetaImageIO.cxx index 143d8446953..600c3c9c3ec 100644 --- a/Modules/IO/Meta/src/itkMetaImageIO.cxx +++ b/Modules/IO/Meta/src/itkMetaImageIO.cxx @@ -86,7 +86,7 @@ MetaImageIO::CanReadFile(const char * filename) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } diff --git a/Modules/IO/NRRD/src/itkNrrdImageIO.cxx b/Modules/IO/NRRD/src/itkNrrdImageIO.cxx index 9eae7e968e8..69b13143646 100644 --- a/Modules/IO/NRRD/src/itkNrrdImageIO.cxx +++ b/Modules/IO/NRRD/src/itkNrrdImageIO.cxx @@ -215,7 +215,7 @@ NrrdImageIO::CanReadFile(const char * filename) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } diff --git a/Modules/IO/PNG/src/itkPNGImageIO.cxx b/Modules/IO/PNG/src/itkPNGImageIO.cxx index 3dcba812580..873be068ba0 100644 --- a/Modules/IO/PNG/src/itkPNGImageIO.cxx +++ b/Modules/IO/PNG/src/itkPNGImageIO.cxx @@ -68,7 +68,7 @@ PNGImageIO::CanReadFile(const char * file) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } diff --git a/Modules/IO/RAW/include/itkRawImageIO.hxx b/Modules/IO/RAW/include/itkRawImageIO.hxx index 2dad2ee18e1..854ee49faa1 100644 --- a/Modules/IO/RAW/include/itkRawImageIO.hxx +++ b/Modules/IO/RAW/include/itkRawImageIO.hxx @@ -140,7 +140,7 @@ RawImageIO::Read(void * buffer) const auto numberOfBytesToBeRead = static_cast(this->GetImageSizeInBytes()); - itkDebugMacro(<< "Reading " << numberOfBytesToBeRead << " bytes"); + itkDebugMacro("Reading " << numberOfBytesToBeRead << " bytes"); const auto componentType = this->GetComponentType(); if (m_FileType == IOFileEnum::Binary) @@ -156,7 +156,7 @@ RawImageIO::Read(void * buffer) this->ReadBufferAsASCII(file, buffer, this->GetComponentType(), this->GetImageSizeInComponents()); } - itkDebugMacro(<< "Reading Done"); + itkDebugMacro("Reading Done"); const SizeValueType numberOfComponents = this->GetImageSizeInComponents(); ReadRawBytesAfterSwapping(componentType, buffer, m_ByteOrder, numberOfComponents); } diff --git a/Modules/IO/Stimulate/src/itkStimulateImageIO.cxx b/Modules/IO/Stimulate/src/itkStimulateImageIO.cxx index 5b0fd6f9358..d21726b61ae 100644 --- a/Modules/IO/Stimulate/src/itkStimulateImageIO.cxx +++ b/Modules/IO/Stimulate/src/itkStimulateImageIO.cxx @@ -64,7 +64,7 @@ StimulateImageIO::CanReadFile(const char * filename) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -72,7 +72,7 @@ StimulateImageIO::CanReadFile(const char * filename) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } @@ -271,7 +271,7 @@ StimulateImageIO::InternalReadImageInformation(std::ifstream & file) else if (text.find("extent") < text.length()) { // not documented - itkDebugMacro(<< "Extent was specified"); + itkDebugMacro("Extent was specified"); } else if (text.find("fov") < text.length()) { @@ -367,7 +367,7 @@ StimulateImageIO::InternalReadImageInformation(std::ifstream & file) char * pch; pch = strchr(line, ':'); sscanf(++pch, "%s", m_FidName); // delete any white space left - itkDebugMacro(<< "fidName was specified"); + itkDebugMacro("fidName was specified"); } else if (text.find("sdtOrient") < text.length()) { @@ -379,12 +379,12 @@ StimulateImageIO::InternalReadImageInformation(std::ifstream & file) char * pch; pch = strchr(line, ':'); sscanf(++pch, "%s", m_SdtOrient); // delete any white space left - itkDebugMacro(<< "Orientation was specified"); + itkDebugMacro("Orientation was specified"); } else if (text.find("dsplyThres") < text.length()) { // not documented - itkDebugMacro(<< "Display threshold was specified"); + itkDebugMacro("Display threshold was specified"); } else if (text.find("endian") < text.length()) { @@ -397,12 +397,12 @@ StimulateImageIO::InternalReadImageInformation(std::ifstream & file) else if (text.find("mapParmFileName") < text.length()) { // not documented - itkDebugMacro(<< "mapParmFileName was specified"); + itkDebugMacro("mapParmFileName was specified"); } else if (text.find("mapTypeName") < text.length()) { // not documented - itkDebugMacro(<< "mapTypeName was specified"); + itkDebugMacro("mapTypeName was specified"); } else if (text.find("stimFileName:") < text.length()) { @@ -432,12 +432,12 @@ StimulateImageIO::InternalReadImageInformation(std::ifstream & file) else if (text.find("mapConf") < text.length()) { // not documented - itkDebugMacro(<< "mapConf was specified"); + itkDebugMacro("mapConf was specified"); } else if (text.find("periodStr") < text.length()) { // not documented - itkDebugMacro(<< "periodStr was specified"); + itkDebugMacro("periodStr was specified"); } } @@ -473,7 +473,7 @@ StimulateImageIO::CanWriteFile(const char * name) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -482,7 +482,7 @@ StimulateImageIO::CanWriteFile(const char * name) if (!extensionFound) { - itkDebugMacro(<< "The filename extension is not recognized"); + itkDebugMacro("The filename extension is not recognized"); return false; } diff --git a/Modules/IO/TIFF/src/itkTIFFImageIO.cxx b/Modules/IO/TIFF/src/itkTIFFImageIO.cxx index c54f1878a1e..460d2823c7f 100644 --- a/Modules/IO/TIFF/src/itkTIFFImageIO.cxx +++ b/Modules/IO/TIFF/src/itkTIFFImageIO.cxx @@ -35,7 +35,7 @@ TIFFImageIO::CanReadFile(const char * file) if (filename.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } @@ -506,7 +506,7 @@ TIFFImageIO::ReadImageInformation() if (!m_IsReadAsScalarPlusPalette) { - itkDebugMacro(<< "Using TIFFReadRGBAImageOriented"); + itkDebugMacro("Using TIFFReadRGBAImageOriented"); if (m_InternalImage->m_BitsPerSample > 8) { itkWarningMacro("Falling back to suboptimal 8-bit RGBA reader. Data loss will occur with reduced bit depth."); @@ -517,7 +517,7 @@ TIFFImageIO::ReadImageInformation() } else { - itkDebugMacro(<< "Using TIFFReadRGBAImageOriented"); + itkDebugMacro("Using TIFFReadRGBAImageOriented"); itkWarningMacro(<< "Could not read this palette image as scalar+Palette because of its TIFF format"); // can't read as scalar+palette so reset type to RGB m_IsReadAsScalarPlusPalette = false; @@ -1188,8 +1188,8 @@ TIFFImageIO::ReadTIFFTags() continue; } - itkDebugMacro(<< "TiffInfo tag " << field_name << '(' << tag << "): " << itkTIFFFieldDataType(field) << ' ' - << value_count << ' ' << raw_data); + itkDebugMacro("TiffInfo tag " << field_name << '(' << tag << "): " << itkTIFFFieldDataType(field) << ' ' + << value_count << ' ' << raw_data); #define itkEncapsulate(T1, T2) \ diff --git a/Modules/IO/TransformBase/src/itkTransformFileReader.cxx b/Modules/IO/TransformBase/src/itkTransformFileReader.cxx index 6decc7bb76a..b1f6c32d34f 100644 --- a/Modules/IO/TransformBase/src/itkTransformFileReader.cxx +++ b/Modules/IO/TransformBase/src/itkTransformFileReader.cxx @@ -158,9 +158,9 @@ TransformFileReaderTemplate::Update() if (KernelTransformHelper::InitializeWMatrix( ioTransformList.front().GetPointer())) { - itkDebugMacro(<< "KernelTransform with dimension " << ioTransformList.front()->GetInputSpaceDimension() - << " is not automatically initialized. \"ComputeWMatrix()\"" - " method has to be called."); + itkDebugMacro("KernelTransform with dimension " << ioTransformList.front()->GetInputSpaceDimension() + << " is not automatically initialized. \"ComputeWMatrix()\"" + " method has to be called."); } } diff --git a/Modules/Nonunit/Review/src/itkVoxBoCUBImageIO.cxx b/Modules/Nonunit/Review/src/itkVoxBoCUBImageIO.cxx index d00891614d8..314ba7437af 100644 --- a/Modules/Nonunit/Review/src/itkVoxBoCUBImageIO.cxx +++ b/Modules/Nonunit/Review/src/itkVoxBoCUBImageIO.cxx @@ -402,7 +402,7 @@ VoxBoCUBImageIO::CanReadFile(const char * filename) if (reader == nullptr) { - itkDebugMacro(<< "The file is not a valid CUB file"); + itkDebugMacro("The file is not a valid CUB file"); return false; } @@ -761,7 +761,7 @@ VoxBoCUBImageIO::CheckExtension(const char * filename, bool & isCompressed) if (fname.empty()) { - itkDebugMacro(<< "No filename specified."); + itkDebugMacro("No filename specified."); return false; } diff --git a/Modules/Numerics/FEM/include/itkFEMSolver.hxx b/Modules/Numerics/FEM/include/itkFEMSolver.hxx index dd0ef615272..5c32ac5101d 100644 --- a/Modules/Numerics/FEM/include/itkFEMSolver.hxx +++ b/Modules/Numerics/FEM/include/itkFEMSolver.hxx @@ -547,7 +547,7 @@ Solver::RunSolver() throw FEMExceptionSolution(__FILE__, __LINE__, "FEMObject::Solve()", "Master force vector was not initialized!"); } timer.Stop(); - itkDebugMacro(<< "Assemble Matrix took " << timer.GetMean() << " seconds.\n"); + itkDebugMacro("Assemble Matrix took " << timer.GetMean() << " seconds.\n"); itk::TimeProbe timer1; timer1.Start(); @@ -559,7 +559,7 @@ Solver::RunSolver() this->GetOutput()->DeepCopy(this->GetInput()); this->UpdateDisplacements(); timer1.Stop(); - itkDebugMacro(<< "FE Solution took " << timer1.GetMean() << " seconds.\n"); + itkDebugMacro("FE Solution took " << timer1.GetMean() << " seconds.\n"); } template diff --git a/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx index 752ea04ba8b..e5f26523009 100644 --- a/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx @@ -142,7 +142,7 @@ ExhaustiveOptimizer::AdvanceOneStep() ParametersType newPosition(spaceDimension); IncrementIndex(newPosition); - itkDebugMacro(<< "new position = " << newPosition); + itkDebugMacro("new position = " << newPosition); this->SetCurrentPosition(newPosition); } diff --git a/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx index fadfab2a16e..ad9e0acd7f7 100644 --- a/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx @@ -120,8 +120,8 @@ OnePlusOneEvolutionaryOptimizer::StartOptimization() } } - itkDebugMacro(<< ": initial position: " << parentPosition); - itkDebugMacro(<< ": initial fitness: " << pvalue); + itkDebugMacro(": initial position: " << parentPosition); + itkDebugMacro(": initial fitness: " << pvalue); this->SetCurrentPosition(parentPosition); const Optimizer::ScalesType & scales = this->GetScales(); @@ -187,20 +187,20 @@ OnePlusOneEvolutionaryOptimizer::StartOptimization() } } - itkDebugMacro(<< "iter: " << iter << ": parent position: " << parentPosition); - itkDebugMacro(<< "iter: " << iter << ": parent fitness: " << pvalue); - itkDebugMacro(<< "iter: " << iter << ": random vector: " << f_norm); - itkDebugMacro(<< "iter: " << iter << ": A: " << std::endl << A); - itkDebugMacro(<< "iter: " << iter << ": delta: " << delta); - itkDebugMacro(<< "iter: " << iter << ": child position: " << childPosition); - itkDebugMacro(<< "iter: " << iter << ": child fitness: " << cvalue); + itkDebugMacro("iter: " << iter << ": parent position: " << parentPosition); + itkDebugMacro("iter: " << iter << ": parent fitness: " << pvalue); + itkDebugMacro("iter: " << iter << ": random vector: " << f_norm); + itkDebugMacro("iter: " << iter << ": A: " << std::endl << A); + itkDebugMacro("iter: " << iter << ": delta: " << delta); + itkDebugMacro("iter: " << iter << ": child position: " << childPosition); + itkDebugMacro("iter: " << iter << ": child fitness: " << cvalue); double adjust = m_ShrinkFactor; if (m_Maximize) { if (cvalue > pvalue) { - itkDebugMacro(<< "iter: " << iter << ": increasing search radius"); + itkDebugMacro("iter: " << iter << ": increasing search radius"); pvalue = cvalue; parent.swap(child); adjust = m_GrowthFactor; @@ -212,14 +212,14 @@ OnePlusOneEvolutionaryOptimizer::StartOptimization() } else { - itkDebugMacro(<< "iter: " << iter << ": decreasing search radius"); + itkDebugMacro("iter: " << iter << ": decreasing search radius"); } } else { if (cvalue < pvalue) { - itkDebugMacro(<< "iter: " << iter << ": increasing search radius"); + itkDebugMacro("iter: " << iter << ": increasing search radius"); pvalue = cvalue; parent.swap(child); adjust = m_GrowthFactor; @@ -231,7 +231,7 @@ OnePlusOneEvolutionaryOptimizer::StartOptimization() } else { - itkDebugMacro(<< "iter: " << iter << ": decreasing search radius"); + itkDebugMacro("iter: " << iter << ": decreasing search radius"); } } @@ -240,10 +240,10 @@ OnePlusOneEvolutionaryOptimizer::StartOptimization() // Compute double precision sum of absolute values of // a single precision vector m_FrobeniusNorm = A.fro_norm(); - itkDebugMacro(<< "A f-norm:" << m_FrobeniusNorm); + itkDebugMacro("A f-norm:" << m_FrobeniusNorm); if (m_FrobeniusNorm <= m_Epsilon) { - itkDebugMacro(<< "converges at iteration = " << iter); + itkDebugMacro("converges at iteration = " << iter); m_StopConditionDescription.str(""); m_StopConditionDescription << this->GetNameOfClass() << ": " << "Fnorm (" << m_FrobeniusNorm << ") is less than Epsilon (" << m_Epsilon @@ -275,7 +275,7 @@ OnePlusOneEvolutionaryOptimizer::StartOptimization() } this->InvokeEvent(IterationEvent()); - itkDebugMacro(<< "Current position: " << this->GetCurrentPosition()); + itkDebugMacro("Current position: " << this->GetCurrentPosition()); } m_StopConditionDescription.str(""); m_StopConditionDescription << this->GetNameOfClass() << ": " diff --git a/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx index ac9d5fd938a..705a8f8b5ea 100644 --- a/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx @@ -74,7 +74,7 @@ PowellOptimizer::GetLineValue(double x, ParametersType & tempCoord) const { tempCoord[i] = this->m_LineOrigin[i] + x * this->m_LineDirection[i]; } - itkDebugMacro(<< "x = " << x); + itkDebugMacro("x = " << x); double val; try { @@ -95,7 +95,7 @@ PowellOptimizer::GetLineValue(double x, ParametersType & tempCoord) const { val = -val; } - itkDebugMacro(<< "val = " << val); + itkDebugMacro("val = " << val); return val; } @@ -207,7 +207,7 @@ PowellOptimizer::LineBracket(double * x1, *f3 = this->GetLineValue(*x3, tempCoord); } - itkDebugMacro(<< "Initial: " << *x1 << ", " << *x2 << ", " << *x3); + itkDebugMacro("Initial: " << *x1 << ", " << *x2 << ", " << *x3); // // Report the central point as the minimum // @@ -282,9 +282,9 @@ PowellOptimizer::BracketedLineOptimize(double ax, *extX = x; *extVal = functionValueOfX; this->SetCurrentLinePoint(x, functionValueOfX); - itkDebugMacro(<< "x = " << *extX); - itkDebugMacro(<< "val = " << *extVal); - itkDebugMacro(<< "return 1"); + itkDebugMacro("x = " << *extX); + itkDebugMacro("val = " << *extVal); + itkDebugMacro("return 1"); return; /* Acceptable approx. is found */ } @@ -395,9 +395,9 @@ PowellOptimizer::BracketedLineOptimize(double ax, *extX = x; *extVal = functionValueOfX; - itkDebugMacro(<< "x = " << *extX); - itkDebugMacro(<< "val = " << *extVal); - itkDebugMacro(<< "return 2"); + itkDebugMacro("x = " << *extX); + itkDebugMacro("val = " << *extVal); + itkDebugMacro("return 2"); this->SetCurrentLinePoint(x, functionValueOfX); } diff --git a/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentOptimizer.cxx index 2ba594c5d02..9ed1b8aff24 100644 --- a/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentOptimizer.cxx @@ -27,7 +27,7 @@ namespace itk void RegularStepGradientDescentOptimizer::StepAlongGradient(double factor, const DerivativeType & transformedGradient) { - itkDebugMacro(<< "factor = " << factor << " transformedGradient= " << transformedGradient); + itkDebugMacro("factor = " << factor << " transformedGradient= " << transformedGradient); const unsigned int spaceDimension = m_CostFunction->GetNumberOfParameters(); @@ -39,7 +39,7 @@ RegularStepGradientDescentOptimizer::StepAlongGradient(double factor, const Deri newPosition[j] = currentPosition[j] + transformedGradient[j] * factor; } - itkDebugMacro(<< "new position = " << newPosition); + itkDebugMacro("new position = " << newPosition); this->SetCurrentPosition(newPosition); } diff --git a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx index 111aa77c7fe..a0790381deb 100644 --- a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx @@ -159,7 +159,7 @@ ExhaustiveOptimizerv4::AdvanceOneStep() ParametersType newPosition(spaceDimension); this->IncrementIndex(newPosition); - itkDebugMacro(<< "new position = " << newPosition); + itkDebugMacro("new position = " << newPosition); this->m_Metric->SetParameters(newPosition); } diff --git a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx index 672fdd93826..6b17f6ea795 100644 --- a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx @@ -127,8 +127,8 @@ OnePlusOneEvolutionaryOptimizerv4::StartOptimizat } } - itkDebugMacro(<< ": initial position: " << parentPosition); - itkDebugMacro(<< ": initial fitness: " << pvalue); + itkDebugMacro(": initial position: " << parentPosition); + itkDebugMacro(": initial fitness: " << pvalue); this->m_Metric->SetParameters(parentPosition); const ScalesType & scales = this->GetScales(); @@ -196,19 +196,19 @@ OnePlusOneEvolutionaryOptimizerv4::StartOptimizat } } - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": parent position: " << parentPosition); - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": parent fitness: " << pvalue); - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": random vector: " << f_norm); - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": A: " << std::endl << A); - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": delta: " << delta); - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": child position: " << childPosition); - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": child fitness: " << cvalue); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": parent position: " << parentPosition); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": parent fitness: " << pvalue); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": random vector: " << f_norm); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": A: " << std::endl << A); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": delta: " << delta); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": child position: " << childPosition); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": child fitness: " << cvalue); double adjust = m_ShrinkFactor; if (cvalue < pvalue) { - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": increasing search radius"); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": increasing search radius"); pvalue = cvalue; parent.swap(child); adjust = m_GrowthFactor; @@ -220,7 +220,7 @@ OnePlusOneEvolutionaryOptimizerv4::StartOptimizat } else { - itkDebugMacro(<< "iter: " << this->m_CurrentIteration << ": decreasing search radius"); + itkDebugMacro("iter: " << this->m_CurrentIteration << ": decreasing search radius"); } m_CurrentCost = pvalue; @@ -228,10 +228,10 @@ OnePlusOneEvolutionaryOptimizerv4::StartOptimizat // Compute double precision sum of absolute values of // a single precision vector m_FrobeniusNorm = A.fro_norm(); - itkDebugMacro(<< "A f-norm:" << m_FrobeniusNorm); + itkDebugMacro("A f-norm:" << m_FrobeniusNorm); if (m_FrobeniusNorm <= m_Epsilon) { - itkDebugMacro(<< "converges at iteration = " << this->m_CurrentIteration); + itkDebugMacro("converges at iteration = " << this->m_CurrentIteration); m_StopConditionDescription.str(""); m_StopConditionDescription << this->GetNameOfClass() << ": " << "Fnorm (" << m_FrobeniusNorm << ") is less than Epsilon (" << m_Epsilon @@ -263,7 +263,7 @@ OnePlusOneEvolutionaryOptimizerv4::StartOptimizat } this->InvokeEvent(IterationEvent()); - itkDebugMacro(<< "Current position: " << this->GetCurrentPosition()); + itkDebugMacro("Current position: " << this->GetCurrentPosition()); } if (this->m_CurrentIteration >= m_MaximumIteration) { diff --git a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx index 0f07b1610af..a820bf9f803 100644 --- a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx @@ -67,7 +67,7 @@ PowellOptimizerv4::GetLineValue(double x, Paramet tempCoord[i] = this->m_LineOrigin[i] + x * this->m_LineDirection[i]; } this->m_Metric->SetParameters(tempCoord); - itkDebugMacro(<< "x = " << x); + itkDebugMacro("x = " << x); double val; try { @@ -84,7 +84,7 @@ PowellOptimizerv4::GetLineValue(double x, Paramet throw; } } - itkDebugMacro(<< "val = " << val); + itkDebugMacro("val = " << val); return val; } @@ -200,7 +200,7 @@ PowellOptimizerv4::LineBracket(double * x *f3 = this->GetLineValue(*x3, tempCoord); } - itkDebugMacro(<< "Initial: " << *x1 << ", " << *x2 << ", " << *x3); + itkDebugMacro("Initial: " << *x1 << ", " << *x2 << ", " << *x3); // // Report the central point as the minimum // @@ -277,9 +277,9 @@ PowellOptimizerv4::BracketedLineOptimize(double *extX = x; *extVal = functionValueOfX; this->SetCurrentLinePoint(x, functionValueOfX); - itkDebugMacro(<< "x = " << *extX); - itkDebugMacro(<< "val = " << *extVal); - itkDebugMacro(<< "return 1"); + itkDebugMacro("x = " << *extX); + itkDebugMacro("val = " << *extVal); + itkDebugMacro("return 1"); return; /* Acceptable approx. is found */ } @@ -390,9 +390,9 @@ PowellOptimizerv4::BracketedLineOptimize(double *extX = x; *extVal = functionValueOfX; - itkDebugMacro(<< "x = " << *extX); - itkDebugMacro(<< "val = " << *extVal); - itkDebugMacro(<< "return 2"); + itkDebugMacro("x = " << *extX); + itkDebugMacro("val = " << *extVal); + itkDebugMacro("return 2"); this->SetCurrentLinePoint(x, functionValueOfX); } diff --git a/Modules/Numerics/Statistics/include/itkHistogramToImageFilter.hxx b/Modules/Numerics/Statistics/include/itkHistogramToImageFilter.hxx index 88ee012f125..809746cb849 100644 --- a/Modules/Numerics/Statistics/include/itkHistogramToImageFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkHistogramToImageFilter.hxx @@ -114,7 +114,7 @@ template void HistogramToImageFilter::GenerateData() { - itkDebugMacro(<< "HistogramToImageFilter::Update() called"); + itkDebugMacro("HistogramToImageFilter::Update() called"); this->AllocateOutputs(); diff --git a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx index 1a3712eb5c2..6929c4d7ea6 100644 --- a/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx +++ b/Modules/Registration/Common/include/itkLandmarkBasedTransformInitializer.hxx @@ -376,8 +376,8 @@ LandmarkBasedTransformInitializer::Intern PointType3D movingCentroid = ComputeCentroid(this->m_MovingLandmarks); - itkDebugMacro(<< "fixed centroid = " << fixedCentroid); - itkDebugMacro(<< "moving centroid = " << movingCentroid); + itkDebugMacro("fixed centroid = " << fixedCentroid); + itkDebugMacro("moving centroid = " << movingCentroid); using VersorType = typename VersorRigid3DTransformType::VersorType; @@ -418,8 +418,8 @@ LandmarkBasedTransformInitializer::Intern } itkDebugStatement(++ii); - itkDebugMacro(<< "f_" << ii << " = " << fixedCentered); - itkDebugMacro(<< "m_" << ii << " = " << movingCentered); + itkDebugMacro("f_" << ii << " = " << fixedCentered); + itkDebugMacro("m_" << ii << " = " << movingCentered); ++movingItr; ++fixedItr; @@ -431,9 +431,9 @@ LandmarkBasedTransformInitializer::Intern CreateMatrix(N, M); - itkDebugMacro(<< "For Closed form solution: "); - itkDebugMacro(<< "M matrix " << M); - itkDebugMacro(<< "N matrix " << N); + itkDebugMacro("For Closed form solution: "); + itkDebugMacro("M matrix " << M); + itkDebugMacro("N matrix " << N); vnl_matrix eigenVectors(4, 4); vnl_vector eigenValues(4); @@ -446,8 +446,8 @@ LandmarkBasedTransformInitializer::Intern symmetricEigenSystem.ComputeEigenValuesAndVectors(N, eigenValues, eigenVectors); - itkDebugMacro(<< "EigenVectors " << eigenVectors); - itkDebugMacro(<< "EigenValues " << eigenValues); + itkDebugMacro("EigenVectors " << eigenVectors); + itkDebugMacro("EigenValues " << eigenValues); // By default eigen values are sorted in ascending order therefore the // maximum eigen value is the one in the fourth place = index 3. We need the @@ -455,7 +455,7 @@ LandmarkBasedTransformInitializer::Intern // eigenvector from the last row, index=3. versor.Set(eigenVectors[3][1], eigenVectors[3][2], eigenVectors[3][3], eigenVectors[3][0]); - itkDebugMacro(<< "Resulting versor" << versor); + itkDebugMacro("Resulting versor" << versor); } @@ -508,8 +508,8 @@ LandmarkBasedTransformInitializer::Intern PointType3D movingCentroid = ComputeCentroid(this->m_MovingLandmarks); - itkDebugMacro(<< "fixed centroid = " << fixedCentroid); - itkDebugMacro(<< "moving centroid = " << movingCentroid); + itkDebugMacro("fixed centroid = " << fixedCentroid); + itkDebugMacro("moving centroid = " << movingCentroid); using VersorType = typename VersorRigid3DTransformType::VersorType; @@ -559,8 +559,8 @@ LandmarkBasedTransformInitializer::Intern } itkDebugStatement(++ii); - itkDebugMacro(<< "f_" << ii << " = " << fixedCentered); - itkDebugMacro(<< "m_" << ii << " = " << movingCentered); + itkDebugMacro("f_" << ii << " = " << fixedCentered); + itkDebugMacro("m_" << ii << " = " << movingCentered); ++movingItr; ++fixedItr; @@ -571,9 +571,9 @@ LandmarkBasedTransformInitializer::Intern itk::Matrix N; CreateMatrix(N, M); - itkDebugMacro(<< "For Closed form solution: "); - itkDebugMacro(<< "M matrix " << M); - itkDebugMacro(<< "N matrix " << N); + itkDebugMacro("For Closed form solution: "); + itkDebugMacro("M matrix " << M); + itkDebugMacro("N matrix " << N); vnl_matrix eigenVectors(4, 4); vnl_vector eigenValues(4); @@ -586,8 +586,8 @@ LandmarkBasedTransformInitializer::Intern symmetricEigenSystem.ComputeEigenValuesAndVectors(N, eigenValues, eigenVectors); - itkDebugMacro(<< "EigenVectors " << eigenVectors); - itkDebugMacro(<< "EigenValues " << eigenValues); + itkDebugMacro("EigenVectors " << eigenVectors); + itkDebugMacro("EigenValues " << eigenValues); // By default eigen values are sorted in ascending order therefore the // maximum eigen value is the one in the fourth place = index 3. We need the @@ -595,7 +595,7 @@ LandmarkBasedTransformInitializer::Intern // eigenvector from the last row, index=3. versor.Set(eigenVectors[3][1], eigenVectors[3][2], eigenVectors[3][3], eigenVectors[3][0]); - itkDebugMacro(<< "Resulting versor" << versor); + itkDebugMacro("Resulting versor" << versor); } transform->SetCenter(fixedCentroid); @@ -671,8 +671,8 @@ LandmarkBasedTransformInitializer::Intern movingCentroid[0] /= this->m_MovingLandmarks.size(); movingCentroid[1] /= this->m_MovingLandmarks.size(); - itkDebugMacro(<< "fixed centroid = " << fixedCentroid); - itkDebugMacro(<< "moving centroid = " << movingCentroid); + itkDebugMacro("fixed centroid = " << fixedCentroid); + itkDebugMacro("moving centroid = " << movingCentroid); double rotationAngle = 0.0; @@ -713,14 +713,14 @@ LandmarkBasedTransformInitializer::Intern s_cross += (movingCentered[1] * fixedCentered[0]) - (movingCentered[0] * fixedCentered[1]); itkDebugStatement(++ii); - itkDebugMacro(<< "f_" << ii << " = " << fixedCentered); - itkDebugMacro(<< "m_" << ii << " = " << movingCentered); + itkDebugMacro("f_" << ii << " = " << fixedCentered); + itkDebugMacro("m_" << ii << " = " << movingCentered); ++movingItr; ++fixedItr; } - itkDebugMacro(<< "Dot Product of landmarks: " << s_dot << " Cross Product: " << s_cross); + itkDebugMacro("Dot Product of landmarks: " << s_dot << " Cross Product: " << s_cross); if (itk::Math::abs(s_dot) > 0.00005) { rotationAngle = std::atan2(s_cross, s_dot); @@ -743,9 +743,9 @@ LandmarkBasedTransformInitializer::Intern transform->SetAngle(rotationAngle); VectorType translation = transform->GetTranslation(); - itkDebugMacro(<< "Initial transform translation: " << translation); + itkDebugMacro("Initial transform translation: " << translation); translation = movingCentroid - fixedCentroid; - itkDebugMacro(<< "translation computed as difference of centroids: " << translation); + itkDebugMacro("translation computed as difference of centroids: " << translation); transform->SetTranslation(translation); } diff --git a/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx b/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx index 79f49972fc3..4530d4ad220 100644 --- a/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx +++ b/Modules/Registration/Common/include/itkMultiResolutionImageRegistrationMethod.hxx @@ -222,10 +222,10 @@ MultiResolutionImageRegistrationMethod::PreparePyrami using IndexType = typename FixedImageRegionType::IndexType; ScheduleType schedule = m_FixedImagePyramid->GetSchedule(); - itkDebugMacro(<< "FixedImage schedule: " << schedule); + itkDebugMacro("FixedImage schedule: " << schedule); ScheduleType movingschedule = m_MovingImagePyramid->GetSchedule(); - itkDebugMacro(<< "MovingImage schedule: " << movingschedule); + itkDebugMacro("MovingImage schedule: " << movingschedule); SizeType inputSize = m_FixedImageRegion.GetSize(); IndexType inputStart = m_FixedImageRegion.GetIndex(); diff --git a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx index 3403c52e146..f7e82c812ea 100644 --- a/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx +++ b/Modules/Registration/Common/include/itkMultiResolutionPyramidImageFilter.hxx @@ -143,7 +143,7 @@ MultiResolutionPyramidImageFilter::SetSchedule(const { if (schedule.rows() != m_NumberOfLevels || schedule.columns() != ImageDimension) { - itkDebugMacro(<< "Schedule has wrong dimensions"); + itkDebugMacro("Schedule has wrong dimensions"); return; } diff --git a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx index 03db481bf15..aca3c970f00 100644 --- a/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx +++ b/Modules/Registration/FEM/include/itkFEMRegistrationFilter.hxx @@ -273,7 +273,7 @@ FEMRegistrationFilter::CreateMesh(unsigne { m_Material->SetYoungsModulus(this->GetElasticity(m_CurrentLevel)); - itkDebugMacro(<< " Generating regular Quad mesh " << std::endl); + itkDebugMacro(" Generating regular Quad mesh " << std::endl); auto meshFilter = ImageToMeshType::New(); meshFilter->SetInput(m_MovingImage); meshFilter->SetPixelsPerElement(pixPerElement); @@ -282,13 +282,13 @@ FEMRegistrationFilter::CreateMesh(unsigne meshFilter->Update(); m_FEMObject = meshFilter->GetOutput(); m_FEMObject->FinalizeMesh(); - itkDebugMacro(<< " Generating regular mesh done " << std::endl); + itkDebugMacro(" Generating regular mesh done " << std::endl); } else if (ImageDimension == 3 && dynamic_cast(&*m_Element) != nullptr) { m_Material->SetYoungsModulus(this->GetElasticity(m_CurrentLevel)); - itkDebugMacro(<< " Generating regular Hex mesh " << std::endl); + itkDebugMacro(" Generating regular Hex mesh " << std::endl); auto meshFilter = ImageToMeshType::New(); meshFilter->SetInput(m_MovingImage); meshFilter->SetPixelsPerElement(pixPerElement); @@ -297,7 +297,7 @@ FEMRegistrationFilter::CreateMesh(unsigne meshFilter->Update(); m_FEMObject = meshFilter->GetOutput(); m_FEMObject->FinalizeMesh(); - itkDebugMacro(<< " Generating regular mesh done " << std::endl); + itkDebugMacro(" Generating regular mesh done " << std::endl); } else { @@ -366,7 +366,7 @@ FEMRegistrationFilter::ApplyLoads(ImageSi // Apply the boundary conditions. We pin the image corners. // First compute which elements these will be. // - itkDebugMacro(<< " Applying loads "); + itkDebugMacro(" Applying loads "); vnl_vector pd; pd.set_size(ImageDimension); @@ -384,11 +384,11 @@ FEMRegistrationFilter::ApplyLoads(ImageSi { m_LandmarkArray[lmind]->GetElementArray()[0] = nullptr; - itkDebugMacro(<< " Prescale Pt: " << m_LandmarkArray[lmind]->GetTarget()); + itkDebugMacro(" Prescale Pt: " << m_LandmarkArray[lmind]->GetTarget()); if (scaling) { m_LandmarkArray[lmind]->ScalePointAndForce(scaling, m_EnergyReductionFactor); - itkDebugMacro(<< " Postscale Pt: " << m_LandmarkArray[lmind]->GetTarget() << "; scale: " << scaling[0]); + itkDebugMacro(" Postscale Pt: " << m_LandmarkArray[lmind]->GetTarget() << "; scale: " << scaling[0]); } pu = m_LandmarkArray[lmind]->GetSource(); @@ -408,7 +408,7 @@ FEMRegistrationFilter::ApplyLoads(ImageSi LoadLandmark::Pointer l5 = dynamic_cast(&*m_LandmarkArray[lmind]->CreateAnother()); m_FEMObject->AddNextLoad(l5); } - itkDebugMacro(<< " Landmarks done"); + itkDebugMacro(" Landmarks done"); } // Now apply the BC loads @@ -494,7 +494,7 @@ FEMRegistrationFilter::ApplyLoads(ImageSi } // end elt loop } ++nodect; - itkDebugMacro(<< " Node: " << nodect); + itkDebugMacro(" Node: " << nodect); } } @@ -543,18 +543,18 @@ FEMRegistrationFilter::IterativeSolve(Sol if (DLS == 2 && deltE < 0.0) { - itkDebugMacro(<< " Line search "); + itkDebugMacro(" Line search "); constexpr float tol = 1.0; // ((0.01 < LastE) ? 0.01 : LastE/10.); LastE = this->GoldenSection(solver, tol, m_LineSearchMaximumIterations); deltE = (m_MinE - LastE); - itkDebugMacro(<< " Line search done " << std::endl); + itkDebugMacro(" Line search done " << std::endl); } ++iters; if (deltE == 0.0) { - itkDebugMacro(<< " No change in energy " << std::endl); + itkDebugMacro(" No change in energy " << std::endl); Done = true; } if ((DLS == 0) && (iters >= m_Maxiters[m_CurrentLevel])) @@ -592,7 +592,7 @@ FEMRegistrationFilter::IterativeSolve(Sol this->EnforceDiffeomorphism(1.0, solver, true); } } - itkDebugMacro(<< " min E: " << m_MinE << "; delt E: " << deltE << "; iters: " << iters << std::endl); + itkDebugMacro(" min E: " << m_MinE << "; delt E: " << deltE << "; iters: " << iters << std::endl); ++m_TotalIterations; } } @@ -637,7 +637,7 @@ FEMRegistrationFilter::InterpolateVectorF } m_FieldSize = field->GetLargestPossibleRegion().GetSize(); - itkDebugMacro(<< " Interpolating vector field of size " << m_FieldSize); + itkDebugMacro(" Interpolating vector field of size " << m_FieldSize); Float rstep, sstep, tstep; @@ -769,7 +769,7 @@ FEMRegistrationFilter::InterpolateVectorF } // Ensure that the values are exact at the nodes. They won't necessarily be unless we use this code. - itkDebugMacro(<< " Interpolation done " << std::endl); + itkDebugMacro(" Interpolation done " << std::endl); } template @@ -791,7 +791,7 @@ FEMRegistrationFilter::ComputeJacobian() m_MinJacobian = statisticsFilter->GetMinimum(); - itkDebugMacro(<< " Min Jacobian: " << m_MinJacobian << std::endl); + itkDebugMacro(" Min Jacobian: " << m_MinJacobian << std::endl); } template @@ -800,7 +800,7 @@ FEMRegistrationFilter::EnforceDiffeomorph SolverType * solver, bool onlywriteimages) { - itkDebugMacro(<< " Checking Jacobian using threshold " << thresh); + itkDebugMacro(" Checking Jacobian using threshold " << thresh); this->ComputeJacobian(); @@ -818,36 +818,36 @@ FEMRegistrationFilter::EnforceDiffeomorph // If using landmarks, warp them if (m_UseLandmarks) { - itkDebugMacro(<< " Warping landmarks: " << m_LandmarkArray.size()); + itkDebugMacro(" Warping landmarks: " << m_LandmarkArray.size()); if (!m_LandmarkArray.empty()) { for (unsigned int lmind = 0; lmind < m_LandmarkArray.size(); ++lmind) { - itkDebugMacro(<< " Old source: " << m_LandmarkArray[lmind]->GetSource()); - itkDebugMacro(<< " Target: " << m_LandmarkArray[lmind]->GetTarget()); + itkDebugMacro(" Old source: " << m_LandmarkArray[lmind]->GetSource()); + itkDebugMacro(" Target: " << m_LandmarkArray[lmind]->GetTarget()); // Convert the source to warped coords. m_LandmarkArray[lmind]->GetSource() = m_LandmarkArray[lmind]->GetSource() + (dynamic_cast(&*solver->GetOutput()->GetLoadWithGlobalNumber(lmind))->GetForce()); - itkDebugMacro(<< " New source: " << m_LandmarkArray[lmind]->GetSource()); - itkDebugMacro(<< " Target: " << m_LandmarkArray[lmind]->GetTarget()); + itkDebugMacro(" New source: " << m_LandmarkArray[lmind]->GetSource()); + itkDebugMacro(" Target: " << m_LandmarkArray[lmind]->GetTarget()); LoadLandmark::Pointer l5 = dynamic_cast(&*m_LandmarkArray[lmind]->CreateAnother()); solver->GetOutput()->AddNextLoad(l5); } - itkDebugMacro(<< " Warping landmarks done "); + itkDebugMacro(" Warping landmarks done "); } else { - itkDebugMacro(<< " Landmark array empty "); + itkDebugMacro(" Landmark array empty "); } } // Store the total deformation by composing with the full field if (!m_TotalField && !onlywriteimages) { - itkDebugMacro(<< " Allocating total deformation field "); + itkDebugMacro(" Allocating total deformation field "); m_TotalField = FieldType::New(); @@ -923,7 +923,7 @@ FEMRegistrationFilter::EnforceDiffeomorph ++totalFieldIter; } - itkDebugMacro(<< " Incremental path length: " << pathsteplength); + itkDebugMacro(" Incremental path length: " << pathsteplength); // Set the field to zero FieldIterator fieldIter(m_Field, m_Field->GetLargestPossibleRegion()); @@ -968,7 +968,7 @@ FEMRegistrationFilter::EnforceDiffeomorph m_Load->SetMovingImage(this->GetMovingImage()); } - itkDebugMacro(<< " Enforcing diffeomorphism done "); + itkDebugMacro(" Enforcing diffeomorphism done "); } template @@ -1005,8 +1005,8 @@ FEMRegistrationFilter::ExpandVectorField( field = m_Field; } - itkDebugMacro(<< " Input field size: " << m_Field->GetLargestPossibleRegion().GetSize()); - itkDebugMacro(<< " Expand factors: "); + itkDebugMacro(" Input field size: " << m_Field->GetLargestPossibleRegion().GetSize()); + itkDebugMacro(" Expand factors: "); VectorType pad; for (unsigned int i = 0; i < ImageDimension; ++i) { @@ -1083,7 +1083,7 @@ FEMRegistrationFilter::PrintVectorField(u VectorType disp = fieldIter.Get(); if ((ct % modnum) == 0) { - itkDebugMacro(<< " Field pix: " << fieldIter.Get() << std::endl); + itkDebugMacro(" Field pix: " << fieldIter.Get() << std::endl); } for (unsigned int i = 0; i < ImageDimension; ++i) { @@ -1096,7 +1096,7 @@ FEMRegistrationFilter::PrintVectorField(u ++ct; } - itkDebugMacro(<< " Max vec: " << max << std::endl); + itkDebugMacro(" Max vec: " << max << std::endl); } template @@ -1105,7 +1105,7 @@ FEMRegistrationFilter::MultiResSolve() { for (m_CurrentLevel = 0; m_CurrentLevel < m_MaxLevel; ++m_CurrentLevel) { - itkDebugMacro(<< " Beginning level " << m_CurrentLevel << std::endl); + itkDebugMacro(" Beginning level " << m_CurrentLevel << std::endl); auto solver = SolverType::New(); @@ -1156,14 +1156,14 @@ FEMRegistrationFilter::MultiResSolve() // Now expand the field for the next level, if necessary. - itkDebugMacro(<< " End level: " << m_CurrentLevel); + itkDebugMacro(" End level: " << m_CurrentLevel); } // end image resolution loop if (m_TotalField) { - itkDebugMacro(<< " Copy field: " << m_TotalField->GetLargestPossibleRegion().GetSize()); - itkDebugMacro(<< " To: " << m_Field->GetLargestPossibleRegion().GetSize() << std::endl); + itkDebugMacro(" Copy field: " << m_TotalField->GetLargestPossibleRegion().GetSize()); + itkDebugMacro(" To: " << m_Field->GetLargestPossibleRegion().GetSize() << std::endl); FieldIterator fieldIter(m_TotalField, m_TotalField->GetLargestPossibleRegion()); fieldIter.GoToBegin(); for (; !fieldIter.IsAtEnd(); ++fieldIter) diff --git a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx index 059398e4c1a..b18c3292506 100644 --- a/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/GPUPDEDeformable/test/itkGPUDemonsRegistrationFilterTest.cxx @@ -56,10 +56,10 @@ class ShowProgressObject : public itk::Object ShowProgress() { // std::cout - itkDebugMacro(<< "Progress: " << m_Process->GetProgress() << " " - << "Iter: " << m_Process->GetElapsedIterations() << " " - << "Metric: " << m_Process->GetMetric() << " " - << "RMSChange: " << m_Process->GetRMSChange() << " "); + itkDebugMacro("Progress: " << m_Process->GetProgress() << " " + << "Iter: " << m_Process->GetElapsedIterations() << " " + << "Metric: " << m_Process->GetMetric() << " " + << "RMSChange: " << m_Process->GetRMSChange() << " "); // << std::endl; if (m_Process->GetElapsedIterations() == 10000) diff --git a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx index 6123b1e22d5..ddcd26e91a4 100644 --- a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx +++ b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierImageFilter.hxx @@ -136,7 +136,7 @@ void BayesianClassifierImageFilter:: ComputeBayesRule() { - itkDebugMacro(<< "Computing Bayes Rule"); + itkDebugMacro("Computing Bayes Rule"); const InputImageType * membershipImage = this->GetInput(); ImageRegionType imageRegion = membershipImage->GetBufferedRegion(); @@ -166,7 +166,7 @@ BayesianClassifierImageFilterGetVectorLength(); - itkDebugMacro(<< "Computing Bayes Rule nclasses in membershipImage: " << numberOfClasses); + itkDebugMacro("Computing Bayes Rule nclasses in membershipImage: " << numberOfClasses); while (!itrMembershipImage.IsAtEnd()) { diff --git a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx index 76534c36105..19f54e81fc5 100644 --- a/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx +++ b/Modules/Segmentation/Classifiers/include/itkBayesianClassifierInitializationImageFilter.hxx @@ -159,7 +159,7 @@ BayesianClassifierInitializationImageFilter void ImageKmeansModelEstimator::PrintKmeansAlgorithmResults() { - itkDebugMacro(<< " "); - itkDebugMacro(<< "Results of the clustering algorithms"); - itkDebugMacro(<< "===================================="); + itkDebugMacro(" "); + itkDebugMacro("Results of the clustering algorithms"); + itkDebugMacro("===================================="); - itkDebugMacro(<< " "); - itkDebugMacro(<< "Means of the clustered vector "); - itkDebugMacro(<< "++++++++++++++++++++++++++++++++++++"); + itkDebugMacro(" "); + itkDebugMacro("Means of the clustered vector "); + itkDebugMacro("++++++++++++++++++++++++++++++++++++"); itkDebugMacro(<< m_Centroid); - itkDebugMacro(<< " "); - itkDebugMacro(<< "Distortion measures "); - itkDebugMacro(<< "+++++++++++++++++++++++++++++++++++ "); + itkDebugMacro(" "); + itkDebugMacro("Distortion measures "); + itkDebugMacro("+++++++++++++++++++++++++++++++++++ "); itkDebugMacro(<< m_CodewordDistortion); - itkDebugMacro(<< " "); - itkDebugMacro(<< "Histogram of the vector "); - itkDebugMacro(<< "+++++++++++++++++++++++++++++++++++ "); + itkDebugMacro(" "); + itkDebugMacro("Histogram of the vector "); + itkDebugMacro("+++++++++++++++++++++++++++++++++++ "); itkDebugMacro(<< m_CodewordHistogram); } @@ -349,7 +349,7 @@ ImageKmeansModelEstimator::WithCodebookUseGLA( } // Try getting new codewords, send a warning to user - itkDebugMacro(<< "Attempting to fill empty cells in the codebook"); + itkDebugMacro("Attempting to fill empty cells in the codebook"); // Consolidate the highest distortion codewords into the beginning // of the array. Take care to protect zero distortion codewords @@ -650,7 +650,7 @@ ImageKmeansModelEstimator::WithoutCodebookUseL const SizeValueType codebookSize = m_Codebook.rows(); if (m_NumberOfCodewords != codebookSize) { - itkDebugMacro(<< "Returning fewer codewords than requested"); + itkDebugMacro("Returning fewer codewords than requested"); } // itkDebugMacro(<<"Done with local function LBG ()"); diff --git a/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.hxx b/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.hxx index 94a072d1e37..c47e1b56a7e 100644 --- a/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.hxx +++ b/Modules/Segmentation/KLMRegionGrowing/include/itkKLMRegionGrowImageFilter.hxx @@ -508,7 +508,7 @@ KLMRegionGrowImageFilter::InitializeKLM() } else { - itkDebugMacro(<< "Passed initialization"); + itkDebugMacro("Passed initialization"); } // Allocate memory to store the array of pointers that point to the @@ -587,8 +587,8 @@ template void KLMRegionGrowImageFilter::MergeRegions() { - itkDebugMacro(<< "--------------------"); - itkDebugMacro(<< " Merging Regions "); + itkDebugMacro("--------------------"); + itkDebugMacro(" Merging Regions "); // Subtract border length before removing it m_TotalBorderLength -= m_BorderCandidate->m_Pointer->GetBorderLength(); @@ -646,9 +646,9 @@ KLMRegionGrowImageFilter::MergeRegions() // For DEBUG purposes if (this->GetDebug()) { - itkDebugMacro(<< "First Region "); + itkDebugMacro("First Region "); pRegion1->PrintRegionInfo(); - itkDebugMacro(<< "Second Region "); + itkDebugMacro("Second Region "); pRegion2->PrintRegionInfo(); } diff --git a/Modules/Segmentation/KLMRegionGrowing/src/itkKLMSegmentationBorder.cxx b/Modules/Segmentation/KLMRegionGrowing/src/itkKLMSegmentationBorder.cxx index d981377573f..494904f7c10 100644 --- a/Modules/Segmentation/KLMRegionGrowing/src/itkKLMSegmentationBorder.cxx +++ b/Modules/Segmentation/KLMRegionGrowing/src/itkKLMSegmentationBorder.cxx @@ -89,16 +89,16 @@ KLMSegmentationBorder::EvaluateLambda() void KLMSegmentationBorder::PrintBorderInfo() { - itkDebugMacro(<< "------------------------------"); - itkDebugMacro(<< "Location : " << this); - itkDebugMacro(<< "Lambda : " << m_Lambda); - itkDebugMacro(<< "Region1 : " << this->GetRegion1()); - itkDebugMacro(<< "Region 1 Label: " << (this->GetRegion1()->GetRegionLabel())); - itkDebugMacro(<< "Region2 : " << this->GetRegion2()); - itkDebugMacro(<< "Region 2 Label: " << (this->GetRegion2()->GetRegionLabel())); - itkDebugMacro(<< "++++++++++++++++++++++++++++++"); - itkDebugMacro(<< "------------------------------"); - itkDebugMacro(<< "------------------------------"); + itkDebugMacro("------------------------------"); + itkDebugMacro("Location : " << this); + itkDebugMacro("Lambda : " << m_Lambda); + itkDebugMacro("Region1 : " << this->GetRegion1()); + itkDebugMacro("Region 1 Label: " << (this->GetRegion1()->GetRegionLabel())); + itkDebugMacro("Region2 : " << this->GetRegion2()); + itkDebugMacro("Region 2 Label: " << (this->GetRegion2()->GetRegionLabel())); + itkDebugMacro("++++++++++++++++++++++++++++++"); + itkDebugMacro("------------------------------"); + itkDebugMacro("------------------------------"); std::cout << "Location : " << this << std::endl << "Lambda : " << m_Lambda << std::endl; } diff --git a/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx b/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx index 9d64414d815..2b2a7ebc0e5 100644 --- a/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx +++ b/Modules/Segmentation/LevelSets/include/itkLevelSetNeighborhoodExtractor.hxx @@ -119,8 +119,8 @@ LevelSetNeighborhoodExtractor::GenerateData() this->GenerateDataFull(); } - itkDebugMacro(<< "No. inside points: " << m_InsidePoints->Size()); - itkDebugMacro(<< "No. outside points: " << m_OutsidePoints->Size()); + itkDebugMacro("No. inside points: " << m_InsidePoints->Size()); + itkDebugMacro("No. outside points: " << m_OutsidePoints->Size()); } /* diff --git a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.hxx b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.hxx index 88e930ad072..4f7f4ebcb44 100644 --- a/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.hxx +++ b/Modules/Segmentation/MarkovRandomFieldsClassifiers/include/itkMRFImageFilter.hxx @@ -377,7 +377,7 @@ MRFImageFilter::ApplyMRFImageFilter() m_NumberOfIterations = 0; do { - itkDebugMacro(<< "Iteration No." << m_NumberOfIterations); + itkDebugMacro("Iteration No." << m_NumberOfIterations); MinimizeFunctional(); m_NumberOfIterations += 1; diff --git a/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx b/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx index 569ac09b3f2..73a9baf6d56 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx +++ b/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx @@ -279,8 +279,8 @@ ConfidenceConnectedImageFilter::GenerateData() function->ThresholdBetween(static_cast(lower), static_cast(upper)); - itkDebugMacro(<< "\nLower intensity = " << lower << ", Upper intensity = " << upper << "\nmean = " << m_Mean - << " , std::sqrt(variance) = " << std::sqrt(m_Variance)); + itkDebugMacro("\nLower intensity = " << lower << ", Upper intensity = " << upper << "\nmean = " << m_Mean + << " , std::sqrt(variance) = " << std::sqrt(m_Variance)); // Segment the image, the iterator walks the output image (so Set() // writes into the output image), starting at the seed point. As @@ -332,10 +332,11 @@ ConfidenceConnectedImageFilter::GenerateData() // if the variance is zero, there is no point in continuing if (Math::AlmostEquals(m_Variance, 0.0)) { - itkDebugMacro(<< "\nLower intensity = " << lower << ", Upper intensity = " << upper << "\nmean = " << m_Mean - << ", variance = " << m_Variance << " , std::sqrt(variance) = " << std::sqrt(m_Variance)); - itkDebugMacro(<< "\nsum = " << sum << ", sumOfSquares = " << sumOfSquares - << "\nnumberOfSamples = " << numberOfSamples); + itkDebugMacro("\nLower intensity = " << lower << ", Upper intensity = " << upper << "\nmean = " << m_Mean + << ", variance = " << m_Variance + << " , std::sqrt(variance) = " << std::sqrt(m_Variance)); + itkDebugMacro("\nsum = " << sum << ", sumOfSquares = " << sumOfSquares + << "\nnumberOfSamples = " << numberOfSamples); break; } lower = m_Mean - m_Multiplier * std::sqrt(m_Variance); @@ -365,9 +366,10 @@ ConfidenceConnectedImageFilter::GenerateData() function->ThresholdBetween(static_cast(lower), static_cast(upper)); - itkDebugMacro(<< "\nLower intensity = " << lower << ", Upper intensity = " << upper << "\nmean = " << m_Mean - << ", variance = " << m_Variance << " , std::sqrt(variance) = " << std::sqrt(m_Variance)); - itkDebugMacro(<< "\nsum = " << sum << ", sumOfSquares = " << sumOfSquares << "\nnum = " << numberOfSamples); + itkDebugMacro("\nLower intensity = " << lower << ", Upper intensity = " << upper << "\nmean = " << m_Mean + << ", variance = " << m_Variance + << " , std::sqrt(variance) = " << std::sqrt(m_Variance)); + itkDebugMacro("\nsum = " << sum << ", sumOfSquares = " << sumOfSquares << "\nnum = " << numberOfSamples); // Rerun the segmentation, the iterator walks the output image, // starting at the seed point. As the iterator walks, if the diff --git a/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.hxx b/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.hxx index af3969b9a77..61edfe63a49 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.hxx +++ b/Modules/Segmentation/RegionGrowing/include/itkVectorConfidenceConnectedImageFilter.hxx @@ -204,7 +204,7 @@ VectorConfidenceConnectedImageFilter::GenerateData() m_ThresholdFunction->SetThreshold(m_Multiplier); - itkDebugMacro(<< "\nMultiplier originally = " << m_Multiplier); + itkDebugMacro("\nMultiplier originally = " << m_Multiplier); // Make sure that the multiplier is large enough to include the seed points // themselves. @@ -232,7 +232,7 @@ VectorConfidenceConnectedImageFilter::GenerateData() // threshold itself. m_ThresholdFunction->SetThreshold(m_Multiplier); - itkDebugMacro(<< "\nMultiplier after verifying seeds inclusion = " << m_Multiplier); + itkDebugMacro("\nMultiplier after verifying seeds inclusion = " << m_Multiplier); // Segment the image, the iterator walks the output image (so Set() // writes into the output image), starting at the seed point. As diff --git a/Modules/Segmentation/SignedDistanceFunction/include/itkPCAShapeSignedDistanceFunction.hxx b/Modules/Segmentation/SignedDistanceFunction/include/itkPCAShapeSignedDistanceFunction.hxx index 2afdd56b186..42b6706bf6d 100644 --- a/Modules/Segmentation/SignedDistanceFunction/include/itkPCAShapeSignedDistanceFunction.hxx +++ b/Modules/Segmentation/SignedDistanceFunction/include/itkPCAShapeSignedDistanceFunction.hxx @@ -168,14 +168,14 @@ PCAShapeSignedDistanceFunction::Evaluate(con // transform the point into the shape model space PointType mappedPoint = m_Transform->TransformPoint(point); - itkDebugMacro(<< "mappedPoint:" << mappedPoint); + itkDebugMacro("mappedPoint:" << mappedPoint); using RealType = typename NumericTraits::RealType; RealType output; if (!m_Interpolators[0]->IsInsideBuffer(mappedPoint)) { - itkDebugMacro(<< "use extrapolator"); + itkDebugMacro("use extrapolator"); output = m_Extrapolators[0]->Evaluate(mappedPoint); for (unsigned int i = 0; i < m_NumberOfPrincipalComponents; ++i) @@ -186,7 +186,7 @@ PCAShapeSignedDistanceFunction::Evaluate(con } else { - itkDebugMacro(<< "use interpolator"); + itkDebugMacro("use interpolator"); output = m_Interpolators[0]->Evaluate(mappedPoint); for (unsigned int i = 0; i < m_NumberOfPrincipalComponents; ++i) diff --git a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx index 7e801c28ec2..c7600faad3e 100644 --- a/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx +++ b/Modules/Segmentation/Voronoi/include/itkVoronoiDiagram2DGenerator.hxx @@ -399,7 +399,7 @@ VoronoiDiagram2DGenerator::ConstructDiagram() } else { - itkDebugMacro(<< "Numerical problem 1" << curr[0] << ' ' << curr1[1]); + itkDebugMacro("Numerical problem 1" << curr[0] << ' ' << curr1[1]); } } } diff --git a/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.hxx b/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.hxx index cb50846cd29..edf142cb96f 100644 --- a/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.hxx +++ b/Modules/Segmentation/Watersheds/include/itkTobogganImageFilter.hxx @@ -96,7 +96,7 @@ TobogganImageFilter::GenerateData() // This is the first pixel we've visited Visited.clear(); Visited.push_back(CurrentPositionIndex); - itkDebugMacro(<< "Found unlabeled pixel at: " << CurrentPositionIndex << " Value: " << MinimumNeighborValue); + itkDebugMacro("Found unlabeled pixel at: " << CurrentPositionIndex << " Value: " << MinimumNeighborValue); // Search along a steepest descent path to a local minimum do { @@ -149,8 +149,8 @@ TobogganImageFilter::GenerateData() } // Get the true class of this pixel MinimumNeighborClass = outputImage->GetPixel(MinimumNeighborIndex); - itkDebugMacro(<< "\tFound Neighbor at: " << MinimumNeighborIndex << " Value: " << MinimumNeighborValue - << " Class: " << MinimumNeighborClass); + itkDebugMacro("\tFound Neighbor at: " << MinimumNeighborIndex << " Value: " << MinimumNeighborValue + << " Class: " << MinimumNeighborClass); // we've slid into a different class if (MinimumNeighborClass > 1) { @@ -172,15 +172,15 @@ TobogganImageFilter::GenerateData() std::vector OpenList; OpenList.clear(); OpenList.push_back(CurrentPositionIndex); - itkDebugMacro(<< "\tFinished slide at: " << CurrentPositionIndex << " Value: " << MinimumNeighborValue - << " Class: " << MinimumNeighborClass); + itkDebugMacro("\tFinished slide at: " << CurrentPositionIndex << " Value: " << MinimumNeighborValue + << " Class: " << MinimumNeighborClass); while (!OpenList.empty()) { // Pop the last one off IndexType SeedIndex = OpenList.back(); OpenList.pop_back(); Visited.push_back(SeedIndex); - itkDebugMacro(<< "Flood fill, looking at " << SeedIndex); + itkDebugMacro("Flood fill, looking at " << SeedIndex); // Look at the neighbors InputImagePixelType SeedValue; SeedValue = inputImage->GetPixel(SeedIndex); @@ -230,7 +230,7 @@ TobogganImageFilter::GenerateData() LabelForRegion = MinimumNeighborClass; CurrentPositionIndex = MinimumNeighborIndex; } - itkDebugMacro(<< "Filling in: " << static_cast(Visited.size()) << " with: " << LabelForRegion); + itkDebugMacro("Filling in: " << static_cast(Visited.size()) << " with: " << LabelForRegion); // Loop over all the visited positions, setting their label for (i = 0; i < Visited.size(); ++i) { diff --git a/Modules/Video/BridgeOpenCV/src/itkOpenCVVideoIO.cxx b/Modules/Video/BridgeOpenCV/src/itkOpenCVVideoIO.cxx index 324d60dff35..0cdcfc87414 100644 --- a/Modules/Video/BridgeOpenCV/src/itkOpenCVVideoIO.cxx +++ b/Modules/Video/BridgeOpenCV/src/itkOpenCVVideoIO.cxx @@ -137,7 +137,7 @@ OpenCVVideoIO::CanReadFile(const char * filename) std::string fname = filename; if (fname == "") { - itkDebugMacro(<< "NoFilename specified"); + itkDebugMacro("NoFilename specified"); return false; } @@ -159,7 +159,7 @@ OpenCVVideoIO::CanReadFile(const char * filename) } if (!extensionFound) { - itkDebugMacro(<< "Unrecognized file extension"); + itkDebugMacro("Unrecognized file extension"); return false; } @@ -367,7 +367,7 @@ OpenCVVideoIO::SetNextFrameToRead(OpenCVVideoIO::FrameOffsetType frameNumber) // Make sure we're not setting past the end if (frameNumber > this->m_LastIFrame) { - itkDebugMacro(<< "Warning: Trying to seek past end of video (past last I-Frame)"); + itkDebugMacro("Warning: Trying to seek past end of video (past last I-Frame)"); return false; } diff --git a/Modules/Video/BridgeVXL/src/itkVXLVideoIO.cxx b/Modules/Video/BridgeVXL/src/itkVXLVideoIO.cxx index 3e165d15201..77672f05bf0 100644 --- a/Modules/Video/BridgeVXL/src/itkVXLVideoIO.cxx +++ b/Modules/Video/BridgeVXL/src/itkVXLVideoIO.cxx @@ -206,7 +206,7 @@ VXLVideoIO::CanReadFile(const char * filename) std::string fname = filename; if (fname == "") { - itkDebugMacro(<< "NoFilename specified"); + itkDebugMacro("NoFilename specified"); return false; } @@ -228,7 +228,7 @@ VXLVideoIO::CanReadFile(const char * filename) } if (!extensionFound) { - itkDebugMacro(<< "Unrecognized file extension"); + itkDebugMacro("Unrecognized file extension"); return false; } @@ -356,7 +356,7 @@ VXLVideoIO::Read(void * buffer) // Advance to the next frame if possible if (!this->m_Reader->advance()) { - itkDebugMacro(<< "Could not advance to the next frame"); + itkDebugMacro("Could not advance to the next frame"); } // Read the current frame @@ -413,7 +413,7 @@ VXLVideoIO::SetNextFrameToRead(FrameOffsetType frameNumber) // Make sure we're not setting past the end if (frameNumber > this->m_LastIFrame) { - itkDebugMacro(<< "Warning: Trying to seek past end of video (past last I-Frame)"); + itkDebugMacro("Warning: Trying to seek past end of video (past last I-Frame)"); return false; } diff --git a/Modules/Video/Core/src/itkTemporalDataObject.cxx b/Modules/Video/Core/src/itkTemporalDataObject.cxx index 8cf3f33b631..a9199610dcc 100644 --- a/Modules/Video/Core/src/itkTemporalDataObject.cxx +++ b/Modules/Video/Core/src/itkTemporalDataObject.cxx @@ -157,7 +157,7 @@ TemporalDataObject::GetUnbufferedRequestedTemporalRegion() // Handle case with unbuffered frames at beginning and end if (reqStart < bufStart && reqEnd > bufEnd) { - itkDebugMacro(<< "Unbuffered frames at beginning and end. Returning entire " + itkDebugMacro("Unbuffered frames at beginning and end. Returning entire " << "requested region as unbuffered"); return this->m_RequestedTemporalRegion; } diff --git a/Modules/Video/IO/include/itkVideoFileReader.hxx b/Modules/Video/IO/include/itkVideoFileReader.hxx index f0a68c650e4..bb018015d65 100644 --- a/Modules/Video/IO/include/itkVideoFileReader.hxx +++ b/Modules/Video/IO/include/itkVideoFileReader.hxx @@ -194,7 +194,7 @@ VideoFileReader::InitializeVideoIO() { // the pixel types don't match so a type conversion needs to be // performed - itkDebugMacro(<< "Buffer conversion required from: " + itkDebugMacro("Buffer conversion required from: " << m_VideoIO->GetComponentTypeAsString(m_VideoIO->GetComponentType()) << " to: " << m_VideoIO->GetComponentTypeAsString(ioType) << " ConvertPixelTraits::NumComponents " << ConvertPixelTraits::GetNumberOfComponents() << " m_VideoIO->NumComponents "