Skip to content

Commit fe69efb

Browse files
committed
ElastixRegistration: Fix linux build, warnings
1 parent 8f2e277 commit fe69efb

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

modules/ElastixRegistration/iAElastixRegistration.cpp

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ void extractChannels(typename itk::VectorImage<InPixelType, DIM>::Pointer vector
2828
typedef itk::ImageFileWriter< OutputImageType > WriterType;
2929

3030

31-
for (int p = 0; p < vectorImg->GetVectorLength(); ++p)
31+
for (unsigned int p = 0; p < vectorImg->GetVectorLength(); ++p)
3232
{
3333
auto indexSelectionFilter = IndexSelectionType::New();
3434
indexSelectionFilter->SetIndex(p);
@@ -104,14 +104,10 @@ void createOutput(iAFilter* filter, QString dirname, bool tranformixActive, bool
104104
jacobianImage->Update();
105105
filter->addOutput(jacobianImage->GetOutput());
106106

107-
108107
writeDeformationImage(filter, dirname, loadTransformixResult);
109108

110109
writeFullJacobian(filter, dirname, loadTransformixResult);
111110
}
112-
113-
114-
115111
}
116112

117113

@@ -201,21 +197,16 @@ void derivative(iAFilter* filter, QMap<QString, QVariant> const & params)
201197

202198
}
203199

204-
205-
206-
207-
208-
209200
QString fixedImagePath = dirname + "/fixed.mhd";
210201
QString movingImagePath = dirname + "/moving.mhd";
211202

212203
typedef itk::Image<T, DIM> OutputImageType;
213204
typedef itk::ImageFileWriter< OutputImageType > WriterType;
214-
WriterType::Pointer fixedWriter = WriterType::New();
205+
typename WriterType::Pointer fixedWriter = WriterType::New();
215206
fixedWriter->SetFileName(fixedImagePath.toStdString());
216207
fixedWriter->SetInput(dynamic_cast<OutputImageType *>(filter->input()[0]->itkImage()));
217208

218-
WriterType::Pointer movingWriter = WriterType::New();
209+
typename WriterType::Pointer movingWriter = WriterType::New();
219210
movingWriter->SetFileName(movingImagePath.toStdString());
220211
movingWriter->SetInput(dynamic_cast<OutputImageType *>(filter->input()[1]->itkImage()));
221212

@@ -224,7 +215,7 @@ void derivative(iAFilter* filter, QMap<QString, QVariant> const & params)
224215
fixedWriter->Update();
225216
movingWriter->Update();
226217
}
227-
catch (itk::ExceptionObject & err)
218+
catch (itk::ExceptionObject & /*err*/)
228219
{
229220

230221
throw std::runtime_error(("Exception save temp files in directory" + dirname).toStdString());
@@ -243,7 +234,7 @@ void derivative(iAFilter* filter, QMap<QString, QVariant> const & params)
243234
{
244235
createOutput(filter, dirname, params["Run Transformix"].toBool(), params["Load Files"].toBool());
245236
}
246-
catch(itk::ImageFileReaderException &err)
237+
catch(itk::ImageFileReaderException & /*err*/)
247238
{
248239

249240
throw std::runtime_error( "Error reading files please set a Outputdir and check Elastix/Transformix logs for more information");

modules/ElastixRegistration/iATsvToVolume.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void createOutput(QList<QList<float>> data, QList<float> maxValues, float offset
7373

7474
ImageType::IndexType pixelIndex;
7575

76-
for each (QList<float> var in data)
76+
for(QList<float> var: data)
7777
{
7878
pixelIndex[0] = (var[1] - offset[0]) / spacing[0];
7979
pixelIndex[1] = (var[2] - offset[1]) / spacing[1];

0 commit comments

Comments
 (0)