Skip to content

Commit c347f23

Browse files
jhlegarretajhlegarreta
committed
STYLE: Do no use m_ to start function parameter names
Do no use `m_` to start function parameter names: as per ITK style guidelines `m_` is reserved for member variables.
1 parent 61c7a93 commit c347f23

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

‎include/itkLabelSetUtils.h‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ DoLineDilateFirstPass(LineBufferType & lineBuf,
118118

119119
template <class LineBufferType, class RealType, bool doDilate>
120120
void
121-
DoLine(LineBufferType & lineBuf, LineBufferType & tmpLineBuf, const RealType magnitude, const RealType m_Extreme)
121+
DoLine(LineBufferType & lineBuf, LineBufferType & tmpLineBuf, const RealType magnitude, const RealType extreme)
122122
{
123123
// contact point algorithm
124124
long koffset = 0, newcontact = 0; // how far away the search starts.
@@ -128,7 +128,7 @@ DoLine(LineBufferType & lineBuf, LineBufferType & tmpLineBuf, const RealType mag
128128
// negative half of the parabola
129129
for (long pos = 0; pos < lineLength; pos++)
130130
{
131-
auto baseVal = (RealType)m_Extreme; // the base value for comparison
131+
auto baseVal = (RealType)extreme; // the base value for comparison
132132
for (long krange = koffset; krange <= 0; krange++)
133133
{
134134
// difference needs to be paramaterised
@@ -147,7 +147,7 @@ DoLine(LineBufferType & lineBuf, LineBufferType & tmpLineBuf, const RealType mag
147147
koffset = newcontact = 0;
148148
for (long pos = lineLength - 1; pos >= 0; pos--)
149149
{
150-
auto baseVal = (RealType)m_Extreme; // the base value for comparison
150+
auto baseVal = (RealType)extreme; // the base value for comparison
151151
for (long krange = koffset; krange >= 0; krange--)
152152
{
153153
RealType T = tmpLineBuf[pos + krange] - magnitude * krange * krange;
@@ -169,7 +169,7 @@ DoLineLabelProp(LineBufferType & lineBuf,
169169
LabBufferType & labelBuf,
170170
LabBufferType & tmpLabelBuf,
171171
const RealType magnitude,
172-
const RealType m_Extreme)
172+
const RealType extreme)
173173
{
174174
// contact point algorithm
175175
long koffset = 0, newcontact = 0; // how far away the search starts.
@@ -180,7 +180,7 @@ DoLineLabelProp(LineBufferType & lineBuf,
180180
// negative half of the parabola
181181
for (long pos = 0; pos < lineLength; pos++)
182182
{
183-
auto baseVal = (RealType)m_Extreme; // the base value for comparison
183+
auto baseVal = (RealType)extreme; // the base value for comparison
184184
LabelType baseLab = labelBuf[pos];
185185
for (long krange = koffset; krange <= 0; krange++)
186186
{
@@ -203,7 +203,7 @@ DoLineLabelProp(LineBufferType & lineBuf,
203203
#if 1
204204
for (long pos = lineLength - 1; pos >= 0; pos--)
205205
{
206-
auto baseVal = (RealType)m_Extreme; // the base value for comparison
206+
auto baseVal = (RealType)extreme; // the base value for comparison
207207
// initialize the label to the previously pro
208208
LabelType baseLab = tmpLabelBuf[pos];
209209
for (long krange = koffset; krange >= 0; krange--)
@@ -238,8 +238,8 @@ doOneDimensionErodeFirstPass(TInIter & inputIterator,
238238
ProgressReporter & progress,
239239
const unsigned lineLength,
240240
const unsigned direction,
241-
const int m_MagnitudeSign,
242-
const bool m_UseImageSpacing,
241+
const int magnitudeSign,
242+
const bool useImageSpacing,
243243
const RealType image_scale,
244244
const RealType sigma,
245245
const bool lastpass)
@@ -249,14 +249,14 @@ doOneDimensionErodeFirstPass(TInIter & inputIterator,
249249
using LineBufferType = typename itk::Array<RealType>;
250250
using LabelBufferType = typename itk::Array<typename TInIter::PixelType>;
251251
RealType iscale = 1.0;
252-
if (m_UseImageSpacing)
252+
if (useImageSpacing)
253253
{
254254
iscale = image_scale;
255255
}
256256
// restructure equation to reduce numerical error
257-
// const RealType magnitude = (m_MagnitudeSign * iscale * iscale)/(2.0 *
257+
// const RealType magnitude = (magnitudeSign * iscale * iscale)/(2.0 *
258258
// sigma);
259-
const RealType magnitude = (m_MagnitudeSign * iscale * iscale) / (2.0);
259+
const RealType magnitude = (magnitudeSign * iscale * iscale) / (2.0);
260260
LineBufferType lineBuf(lineLength);
261261
LabelBufferType labBuf(lineLength);
262262

@@ -376,8 +376,8 @@ doOneDimensionDilateFirstPass(TInIter & inputIterator,
376376
ProgressReporter & progress,
377377
const unsigned lineLength,
378378
const unsigned direction,
379-
const int m_MagnitudeSign,
380-
const bool m_UseImageSpacing,
379+
const int magnitudeSign,
380+
const bool useImageSpacing,
381381
const RealType image_scale,
382382
const RealType sigma)
383383
{
@@ -386,14 +386,14 @@ doOneDimensionDilateFirstPass(TInIter & inputIterator,
386386
using LineBufferType = typename itk::Array<RealType>;
387387
using LabelBufferType = typename itk::Array<typename TInIter::PixelType>;
388388
RealType iscale = 1.0;
389-
if (m_UseImageSpacing)
389+
if (useImageSpacing)
390390
{
391391
iscale = image_scale;
392392
}
393393
// restructure equation to reduce numerical error
394-
// const RealType magnitude = (m_MagnitudeSign * iscale * iscale)/(2.0 *
394+
// const RealType magnitude = (magnitudeSign * iscale * iscale)/(2.0 *
395395
// sigma);
396-
const RealType magnitude = (m_MagnitudeSign * iscale * iscale) / (2.0);
396+
const RealType magnitude = (magnitudeSign * iscale * iscale) / (2.0);
397397
LineBufferType lineBuf(lineLength);
398398
LabelBufferType labBuf(lineLength);
399399
LineBufferType tmpLineBuf(lineLength);
@@ -459,9 +459,9 @@ doOneDimensionErode(TInIter & inputIterator,
459459
ProgressReporter & progress,
460460
const unsigned lineLength,
461461
const unsigned direction,
462-
const int m_MagnitudeSign,
463-
const bool m_UseImageSpacing,
464-
const RealType m_Extreme,
462+
const int magnitudeSign,
463+
const bool useImageSpacing,
464+
const RealType extreme,
465465
const RealType image_scale,
466466
const RealType sigma,
467467
const RealType BaseSigma,
@@ -471,11 +471,11 @@ doOneDimensionErode(TInIter & inputIterator,
471471
using LineBufferType = typename itk::Array<RealType>;
472472
using LabelBufferType = typename itk::Array<typename TInIter::PixelType>;
473473
RealType iscale = 1.0;
474-
if (m_UseImageSpacing)
474+
if (useImageSpacing)
475475
{
476476
iscale = image_scale;
477477
}
478-
const RealType magnitude = (m_MagnitudeSign * iscale * iscale) / (2.0 * sigma);
478+
const RealType magnitude = (magnitudeSign * iscale * iscale) / (2.0 * sigma);
479479
LineBufferType lineBuf(lineLength);
480480
LabelBufferType labBuf(lineLength);
481481

@@ -554,7 +554,7 @@ doOneDimensionErode(TInIter & inputIterator,
554554

555555
std::copy(&(lineBuf[first]), &(lineBuf[last + 1]), &(ShortLineBuf[1]));
556556

557-
DoLine<LineBufferType, RealType, false>(ShortLineBuf, tmpShortLineBuf, magnitude, m_Extreme);
557+
DoLine<LineBufferType, RealType, false>(ShortLineBuf, tmpShortLineBuf, magnitude, extreme);
558558
// copy the segment back into the full line buffer
559559
std::copy(&(ShortLineBuf[1]), &(ShortLineBuf[SLL + 1]), &(lineBuf[first]));
560560
}
@@ -600,9 +600,9 @@ doOneDimensionDilate(TInIter & inputIterator,
600600
ProgressReporter & progress,
601601
const unsigned lineLength,
602602
const unsigned direction,
603-
const int m_MagnitudeSign,
604-
const bool m_UseImageSpacing,
605-
const RealType m_Extreme,
603+
const int magnitudeSign,
604+
const bool useImageSpacing,
605+
const RealType extreme,
606606
const RealType image_scale,
607607
const RealType sigma)
608608
{
@@ -611,13 +611,13 @@ doOneDimensionDilate(TInIter & inputIterator,
611611
using LineBufferType = typename itk::Array<RealType>;
612612
using LabelBufferType = typename itk::Array<typename TInIter::PixelType>;
613613
RealType iscale = 1.0;
614-
if (m_UseImageSpacing)
614+
if (useImageSpacing)
615615
{
616616
iscale = image_scale;
617617
}
618618
// restructure equation to reduce numerical error
619-
const RealType magnitude = (m_MagnitudeSign * iscale * iscale) / (2.0 * sigma);
620-
// const RealType magnitude = (m_MagnitudeSign * iscale * iscale)/(2.0 );
619+
const RealType magnitude = (magnitudeSign * iscale * iscale) / (2.0 * sigma);
620+
// const RealType magnitude = (magnitudeSign * iscale * iscale)/(2.0 );
621621
LineBufferType lineBuf(lineLength);
622622
LabelBufferType labBuf(lineLength);
623623
LineBufferType tmpLineBuf(lineLength);
@@ -652,7 +652,7 @@ doOneDimensionDilate(TInIter & inputIterator,
652652
}
653653

654654
DoLineLabelProp<LineBufferType, LabelBufferType, RealType, true>(
655-
lineBuf, tmpLineBuf, labBuf, tmpLabBuf, magnitude, m_Extreme);
655+
lineBuf, tmpLineBuf, labBuf, tmpLabBuf, magnitude, extreme);
656656
// copy the line buffer back to the image
657657
unsigned j = 0;
658658
while (!outputDistIterator.IsAtEndOfLine())

0 commit comments

Comments
 (0)