Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Modules/Core/Common/include/itkImageSource.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ ImageSource<TOutputImage>::ThreadedGenerateData(const OutputImageRegionType &
#if !defined(ITK_LEGACY_REMOVE)
this->DynamicThreadedGenerateData(region);
#else
itkExceptionMacro("With DynamicMultiThreadingOff subclass should override this method. \
The signature of ThreadedGenerateData() has been changed in ITK v4 to use the new ThreadIdType.");
itkExceptionMacro("With DynamicMultiThreadingOff subclass should override this method. The signature of "
"ThreadedGenerateData() has been changed in ITK v4 to use the new ThreadIdType.");
#endif
}

Expand All @@ -264,9 +264,9 @@ template <typename TOutputImage>
void
ImageSource<TOutputImage>::DynamicThreadedGenerateData(const OutputImageRegionType &)
{
itkExceptionMacro("Subclass should override this method!!! \
If old behavior is desired invoke this->DynamicMultiThreadingOff(); \
before Update() is called. The best place is in class constructor.");
itkExceptionMacro(
"Subclass should override this method!!! If old behavior is desired invoke this->DynamicMultiThreadingOff(); "
"before Update() is called. The best place is in class constructor.");
}

// Callback routine used by the classic threading library. This routine just calls
Expand Down
20 changes: 8 additions & 12 deletions Modules/Core/Common/include/itkPlatformMultiThreader.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,14 @@ class ITKCommon_EXPORT PlatformMultiThreader : public MultiThreaderBase
* of threads was accepted. Legacy: use MultiThreaderBase to invoke these. */
itkLegacyMacro(static void SetGlobalMaximumNumberOfThreads(ThreadIdType val))
{
itkGenericOutputMacro("Warning: SetGlobalMaximumNumberOfThreads \
should now be called on itk::MultiThreaderBase. \
It can affect all MultiThreaderBase's derived classes in ITK");
itkGenericOutputMacro("Warning: SetGlobalMaximumNumberOfThreads should now be called on itk::MultiThreaderBase. It "
"can affect all MultiThreaderBase's derived classes in ITK");
Superclass::SetGlobalMaximumNumberOfThreads(val);
}
itkLegacyMacro(static ThreadIdType GetGlobalMaximumNumberOfThreads())
{
itkGenericOutputMacro("Warning: GetGlobalMaximumNumberOfThreads \
should now be called on itk::MultiThreaderBase. \
It can affect all MultiThreaderBase's derived classes in ITK");
itkGenericOutputMacro("Warning: GetGlobalMaximumNumberOfThreads should now be called on itk::MultiThreaderBase. It "
"can affect all MultiThreaderBase's derived classes in ITK");
return Superclass::GetGlobalMaximumNumberOfThreads();
}

Expand All @@ -91,16 +89,14 @@ It can affect all MultiThreaderBase's derived classes in ITK");
* of threads was accepted. Legacy: use MultiThreaderBase to invoke these. */
itkLegacyMacro(static void SetGlobalDefaultNumberOfThreads(ThreadIdType val))
{
itkGenericOutputMacro("Warning: SetGlobalDefaultNumberOfThreads \
should now be called on itk::MultiThreaderBase. \
It can affect all MultiThreaderBase's derived classes in ITK");
itkGenericOutputMacro("Warning: SetGlobalDefaultNumberOfThreads should now be called on itk::MultiThreaderBase. It "
"can affect all MultiThreaderBase's derived classes in ITK");
Superclass::SetGlobalDefaultNumberOfThreads(val);
}
itkLegacyMacro(static ThreadIdType GetGlobalDefaultNumberOfThreads())
{
itkGenericOutputMacro("Warning: GetGlobalDefaultNumberOfThreads \
should now be called on itk::MultiThreaderBase. \
It can affect all MultiThreaderBase's derived classes in ITK");
itkGenericOutputMacro("Warning: GetGlobalDefaultNumberOfThreads should now be called on itk::MultiThreaderBase. It "
"can affect all MultiThreaderBase's derived classes in ITK");
return Superclass::GetGlobalDefaultNumberOfThreads();
}
#endif
Expand Down
3 changes: 1 addition & 2 deletions Modules/Core/Common/include/itkVersor.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,7 @@ Versor<T>::Normalize()
if (itk::Math::abs(tensor) < 1e-20)
{
ExceptionObject except;
except.SetDescription("Attempt to normalize a \
itk::Versor with zero tensor");
except.SetDescription("Attempt to normalize a itk::Versor with zero tensor");
except.SetLocation(__FILE__);
throw except;
}
Expand Down
6 changes: 2 additions & 4 deletions Modules/Core/Common/src/itkMultiThreaderBase.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,8 @@ MultiThreaderBase::GetGlobalDefaultThreaderPrivate()
itksys::SystemTools::GetEnv("ITK_USE_THREADPOOL", envVar))
{
envVar = itksys::SystemTools::UpperCase(envVar);
itkGenericOutputMacro("Warning: ITK_USE_THREADPOOL \
has been deprecated since ITK v5.0. \
You should now use ITK_GLOBAL_DEFAULT_THREADER\
\nFor example ITK_GLOBAL_DEFAULT_THREADER=Pool");
itkGenericOutputMacro("Warning: ITK_USE_THREADPOOL has been deprecated since ITK v5.0. You should now use "
"ITK_GLOBAL_DEFAULT_THREADER\nFor example ITK_GLOBAL_DEFAULT_THREADER=Pool");
if (envVar != "NO" && envVar != "OFF" && envVar != "FALSE")
{
#ifdef __EMSCRIPTEN__
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ QuadEdgeMeshEulerOperatorDeleteCenterVertexFunction<TMesh, TQEType>::Evaluate(QE
}
if (!SecondFaceFound)
{
itkDebugMacro("DeleteVertex requires at least two distinct \
facets incident to the facets that are incident to g->GetDestination().");
itkDebugMacro("DeleteVertex requires at least two distinct facets incident to the facets that are incident to "
"g->GetDestination().");
return ((QEType *)nullptr);
}

Expand Down
3 changes: 1 addition & 2 deletions Modules/Numerics/Statistics/include/itkDistanceMetric.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ class ITK_TEMPLATE_EXPORT DistanceMetric : public FunctionBase<TVector, double>
// exception
if (defaultLength != s)
{
itkExceptionMacro("Attempting to change the measurement \
vector size of a non-resizable vector type");
itkExceptionMacro("Attempting to change the measurement vector size of a non-resizable vector type");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ ImageClassifierFilter<TSample, TInputImage, TOutputImage>::GenerateData()

if (membershipFunctionsWeightsArray.Size() != this->m_NumberOfClasses)
{
itkExceptionMacro("Membership functions weight array size does not match the\
number of classes ");
itkExceptionMacro("Membership functions weight array size does not match the number of classes ");
}

const auto * inputImage = static_cast<const InputImageType *>(this->ProcessObject::GetInput(0));
Expand Down
6 changes: 2 additions & 4 deletions Modules/Numerics/Statistics/include/itkSample.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ class Sample : public DataObject
// only change the measurement vector size if the container is empty.
if (this->Size())
{
itkExceptionMacro("Attempting to change the measurement \
vector size of a non-empty Sample");
itkExceptionMacro("Attempting to change the measurement vector size of a non-empty Sample");
}
else
{
Expand All @@ -149,8 +148,7 @@ class Sample : public DataObject
// exception
if (defaultLength != s)
{
itkExceptionMacro("Attempting to change the measurement \
vector size of a non-resizable vector type");
itkExceptionMacro("Attempting to change the measurement vector size of a non-resizable vector type");
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ SampleClassifierFilter<TSample>::GenerateData()

if (membershipFunctionsWeightsArray.Size() != this->m_NumberOfClasses)
{
itkExceptionMacro("Membership functions weight array size does not match the\
number of classes ");
itkExceptionMacro("Membership functions weight array size does not match the number of classes ");
}

const auto * sample = static_cast<const SampleType *>(this->ProcessObject::GetInput(0));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ FindSampleBound(const TSample * sample,

if (sample->Size() == 0)
{
itkGenericExceptionMacro(<< "Attempting to compute bounds of a sample list containing no\
measurement vectors");
itkGenericExceptionMacro(<< "Attempting to compute bounds of a sample list containing no measurement vectors");
}

min = begin.GetMeasurementVector();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ CompareHistogramImageToImageMetric<TFixedImage, TMovingImage>::FormTrainingHisto

if (NumberOfPixelsCounted == 0)
{
itkExceptionMacro(<< "All the points mapped to outside of the Training moving \
age");
itkExceptionMacro(<< "All the points mapped to outside of the Training moving age");
}
}

Expand Down