From 204087abbc2842775d6df583e9588ee60aaf9bef Mon Sep 17 00:00:00 2001 From: David Sarrut Date: Thu, 28 Jul 2011 15:36:51 +0200 Subject: [PATCH] correct merge --- common/clitkDicomRT_Contour.cxx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx index f48ecde..74bafda 100644 --- a/common/clitkDicomRT_Contour.cxx +++ b/common/clitkDicomRT_Contour.cxx @@ -144,19 +144,7 @@ bool clitk::DicomRT_Contour::Read(gdcm::Item * item) const gdcm::DataElement & contourdata = nestedds2.GetDataElement( tcontourdata ); at.SetFromDataElement( contourdata ); const double* points = at.GetValues(); -<<<<<<< Updated upstream -<<<<<<< Updated upstream -<<<<<<< variant A ->>>>>>> variant B - // unsigned int npts = at.GetNumberOfValues() / 3; -======= end -======= - // unsigned int npts = at.GetNumberOfValues() / 3; ->>>>>>> Stashed changes -======= - // unsigned int npts = at.GetNumberOfValues() / 3; ->>>>>>> Stashed changes - + unsigned int npts = at.GetNumberOfValues() / 3; assert(at.GetNumberOfValues() == static_cast(mNbOfPoints)*3); // Organize values -- 2.47.1