Mercurial > hg > orthanc-stone
diff OrthancStone/Sources/Toolbox/DicomStructureSet.cpp @ 1571:85e117739eca
cppcheck
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 21 Sep 2020 17:46:39 +0200 |
parents | 244ad1e4e76a |
children | 4fb8fdf03314 |
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomStructureSet.cpp Mon Sep 21 14:50:26 2020 +0200 +++ b/OrthancStone/Sources/Toolbox/DicomStructureSet.cpp Mon Sep 21 17:46:39 2020 +0200 @@ -259,12 +259,12 @@ extent_.Reset(); - for (Points::const_iterator it = points_.begin(); it != points_.end(); ++it) + for (Points::const_iterator it2 = points_.begin(); it2 != points_.end(); ++it2) { - if (IsPointOnSliceIfAny(*it)) + if (IsPointOnSliceIfAny(*it2)) { double x, y; - geometry.ProjectPoint2(x, y, *it); + geometry.ProjectPoint2(x, y, *it2); extent_.AddPoint(x, y); } } @@ -470,10 +470,10 @@ DicomDatasetReader reader(tags); size_t count, tmp; - if (!tags.GetSequenceSize(count, DICOM_TAG_RT_ROI_OBSERVATIONS_SEQUENCE) || - !tags.GetSequenceSize(tmp, DICOM_TAG_ROI_CONTOUR_SEQUENCE) || + if (!tags.GetSequenceSize(count, DicomPath(DICOM_TAG_RT_ROI_OBSERVATIONS_SEQUENCE)) || + !tags.GetSequenceSize(tmp, DicomPath(DICOM_TAG_ROI_CONTOUR_SEQUENCE)) || tmp != count || - !tags.GetSequenceSize(tmp, DICOM_TAG_STRUCTURE_SET_ROI_SEQUENCE) || + !tags.GetSequenceSize(tmp, DicomPath(DICOM_TAG_STRUCTURE_SET_ROI_SEQUENCE)) || tmp != count) { throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);