Skip to content

Commit 91bfa7f

Browse files
N-Dekkerhjmjohnson
authored andcommitted
ENH: Declare MakeOutput member function of three filters public
Paved the way for those filters to use `ProcessObject::MakeRequiredOutputs`. `MakeOutput` member functions are usually declared public, rather than protected.
1 parent 2dbf8c6 commit 91bfa7f

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Modules/Numerics/Statistics/include/itkCovarianceSampleFilter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,6 @@ class ITK_TEMPLATE_EXPORT CovarianceSampleFilter : public ProcessObject
121121
MeasurementVectorSizeType
122122
GetMeasurementVectorSize() const;
123123

124-
protected:
125-
CovarianceSampleFilter();
126-
~CovarianceSampleFilter() override = default;
127-
void
128-
PrintSelf(std::ostream & os, Indent indent) const override;
129-
130124
/** DataObject pointer */
131125
using DataObjectPointer = DataObject::Pointer;
132126

@@ -135,6 +129,12 @@ class ITK_TEMPLATE_EXPORT CovarianceSampleFilter : public ProcessObject
135129
DataObjectPointer
136130
MakeOutput(DataObjectPointerArraySizeType index) override;
137131

132+
protected:
133+
CovarianceSampleFilter();
134+
~CovarianceSampleFilter() override = default;
135+
void
136+
PrintSelf(std::ostream & os, Indent indent) const override;
137+
138138
void
139139
GenerateData() override;
140140
}; // end of class

Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@ class ITK_TEMPLATE_EXPORT StandardDeviationPerComponentSampleFilter : public Pro
9898
const MeasurementVectorRealDecoratedType *
9999
GetMeanPerComponentOutput() const;
100100

101-
protected:
102-
StandardDeviationPerComponentSampleFilter();
103-
~StandardDeviationPerComponentSampleFilter() override = default;
104-
void
105-
PrintSelf(std::ostream & os, Indent indent) const override;
106-
107101
/** DataObject pointer */
108102
using DataObjectPointer = DataObject::Pointer;
109103

@@ -112,6 +106,12 @@ class ITK_TEMPLATE_EXPORT StandardDeviationPerComponentSampleFilter : public Pro
112106
DataObjectPointer
113107
MakeOutput(DataObjectPointerArraySizeType index) override;
114108

109+
protected:
110+
StandardDeviationPerComponentSampleFilter();
111+
~StandardDeviationPerComponentSampleFilter() override = default;
112+
void
113+
PrintSelf(std::ostream & os, Indent indent) const override;
114+
115115
void
116116
GenerateData() override;
117117

Modules/Registration/Common/include/itkBlockMatchingImageFilter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ class ITK_TEMPLATE_EXPORT BlockMatchingImageFilter : public MeshToMeshFilter<TFe
160160
return dynamic_cast<SimilaritiesType *>(this->ProcessObject::GetOutput(1));
161161
}
162162

163-
protected:
164163
/** MakeOutput is provided for handling multiple outputs */
165164
using Superclass::MakeOutput;
166165
DataObject::Pointer
167166
MakeOutput(ProcessObject::DataObjectPointerArraySizeType idx) override;
168167

168+
protected:
169169
/** We need to create our own GenerateOutputInformation because the
170170
* default version from ProcessObject result in a dynamic_cast of the input
171171
* pointer to the output pointer type in PointSet::CopyInformation. This does

0 commit comments

Comments
 (0)