Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove recursive header includes #314

Merged
merged 2 commits into from
Dec 18, 2021
Merged

remove recursive header includes #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9347485
COMP: Remove inclusion of .hxx files as headers
hjmjohnson Dec 17, 2021
a792296
STYLE: Prefer itk::Math::abs for consistency.
hjmjohnson Dec 17, 2021
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
2 changes: 1 addition & 1 deletion src/Core/Common/DistanceBetweenPoints/Code.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ main(int, char *[])
PointType::RealType dist2 = p0.SquaredEuclideanDistanceTo(p1);
std::cout << "Dist2: " << dist2 << std::endl;

if (std::abs(dist2 - dist * dist) < itk::Math::eps)
if (itk::Math::abs(dist2 - dist * dist) < itk::Math::eps)
{
std::cerr << "dist2 != dist * dist" << std::endl;
return EXIT_FAILURE;
Expand Down
1 change: 0 additions & 1 deletion src/Developer/ImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkImageFilter_hxx
#define __itkImageFilter_hxx

#include "ImageFilter.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is a similar change needed in the software guide? If there are any instances of this, it is.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

InsightSoftwareConsortium/ITKSoftwareGuide#171 for the coding style guidelines section.

#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
#include "itkImageRegionConstIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/ImageFilterMultipleInputsDifferentType.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkImageFilterMultipleInputs_hxx
#define __itkImageFilterMultipleInputs_hxx

#include "ImageFilterMultipleInputsDifferentType.h"

#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/ImageFilterMultipleOutputs.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkImageFilterMultipleOutputs_hxx
#define __itkImageFilterMultipleOutputs_hxx

#include "ImageFilterMultipleOutputs.h"

#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/ImageFilterMultipleOutputsDifferentType.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkImageFilterMultipleOutputsDifferentType_hxx
#define __itkImageFilterMultipleOutputsDifferentType_hxx

#include "ImageFilterMultipleOutputsDifferentType.h"

#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/ImageFilterX.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkImageFilter_hxx
#define __itkImageFilter_hxx

#include "ImageFilterX.h"
#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
#include "itkImageRegionConstIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/ImageFilterY.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __ImageFilterY_hxx
#define __ImageFilterY_hxx

#include "ImageFilterY.h"
#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"

Expand Down
1 change: 0 additions & 1 deletion src/Developer/ImageSource.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkImageSource_hxx
#define __itkImageSource_hxx

#include "ImageSource.h"
#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
#include "itkImageRegionConstIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/MultiThreadedImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkMultiThreadedImageFilter_hxx
#define __itkMultiThreadedImageFilter_hxx

#include "MultiThreadedImageFilter.h"

#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/MyInPlaceImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkMyInPlaceImageFilter_hxx
#define __itkMyInPlaceImageFilter_hxx

#include "MyInPlaceImageFilter.h"

#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/itkImageFilterMultipleInputs.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef itkImageFilterMultipleInputs_hxx
#define itkImageFilterMultipleInputs_hxx

#include "itkImageFilterMultipleInputs.h"

#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
Expand Down
1 change: 0 additions & 1 deletion src/Developer/itkOilPaintingImageFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#ifndef __itkOilPaintingImageFilter_hxx
#define __itkOilPaintingImageFilter_hxx

#include "itkOilPaintingImageFilter.h"
#include "itkObjectFactory.h"
#include "itkImageRegionIterator.h"
#include "itkImageRegionConstIterator.h"
Expand Down
2 changes: 1 addition & 1 deletion src/Filtering/MathematicalMorphology/GenerateStructureElementsWithAccurateArea/Code.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ ComputeAreaError(SEType k, unsigned int thickness)
std::cout << "Expected foreground area: " << expectedForegroundArea << std::endl;
std::cout << "Computed foreground area: " << computedForegroundArea << std::endl;
std::cout << "Foreground area error: "
<< 100 * std::abs(expectedForegroundArea - computedForegroundArea) / expectedForegroundArea << "%"
<< 100 * itk::Math::abs(expectedForegroundArea - computedForegroundArea) / expectedForegroundArea << "%"
<< "\n\n";

return EXIT_FAILURE;
Expand Down