X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=common%2FclitkDicomRT_Contour.cxx;h=9a5042befdef6b7b14f63a86d8e23aa42e290704;hb=73f0ab806cbb168db4d09908a714f8b7a662ee21;hp=bcff817af994ab2fd80b27acf8b4d567e6f5b393;hpb=f3b20077dc1019a4e5100f20dd6875d1e6327c9a;p=clitk.git diff --git a/common/clitkDicomRT_Contour.cxx b/common/clitkDicomRT_Contour.cxx index bcff817..9a5042b 100644 --- a/common/clitkDicomRT_Contour.cxx +++ b/common/clitkDicomRT_Contour.cxx @@ -20,7 +20,7 @@ #include "clitkDicomRT_Contour.h" #include -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 #include "gdcmAttribute.h" #include "gdcmItem.h" #endif @@ -53,7 +53,7 @@ void clitk::DicomRT_Contour::Print(std::ostream & os) const //-------------------------------------------------------------------- -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 void clitk::DicomRT_Contour::UpdateDicomItem() { DD("DicomRT_Contour::UpdateDicomItem"); @@ -119,7 +119,7 @@ void clitk::DicomRT_Contour::UpdateDicomItem() //-------------------------------------------------------------------- -#if GDCM_MAJOR_VERSION == 2 +#if GDCM_MAJOR_VERSION >= 2 bool clitk::DicomRT_Contour::Read(gdcm::Item * item) { mItem = item; @@ -274,7 +274,7 @@ void clitk::DicomRT_Contour::ComputeMeshFromDataPoints() double pointIn[4]; for (unsigned int j=0 ; j<3; ++j) pointIn[j] = mData->GetPoint(idx)[j]; - pointIn[4] = 1.0; + pointIn[3] = 1.0; /*double pointOut[4]; mTransformMatrix->MultiplyPoint(pointIn, pointOut); std::cout << pointOut[0] << " " << pointOut[1] << " " << pointOut[2] << " " << pointOut[3] << std::endl;