X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkgdcmSerieViewer.cxx;h=5c0beb3c9e1b4af7081d2c107d47476618671fa3;hb=d92b9d9e464607d503446b6decf0713c6a712638;hp=9c18792a062bf4aa57b82697acb3f06fb3910341;hpb=ab1ee4ff1d58029e25ecb86525ca2976f0f5ada2;p=gdcm.git diff --git a/vtk/vtkgdcmSerieViewer.cxx b/vtk/vtkgdcmSerieViewer.cxx index 9c18792a..5c0beb3c 100644 --- a/vtk/vtkgdcmSerieViewer.cxx +++ b/vtk/vtkgdcmSerieViewer.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: vtkgdcmSerieViewer.cxx,v $ Language: C++ - Date: $Date: 2005/10/20 14:46:29 $ - Version: $Revision: 1.13 $ + Date: $Date: 2005/11/14 17:40:48 $ + Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) // ----------------------- End Arguments Manager ---------------------- - gdcm::SerieHelper *sh = new gdcm::SerieHelper(); + gdcm::SerieHelper *sh = gdcm::SerieHelper::New(); sh->SetLoadMode(loadMode); if (reverse) sh->SetSortOrderToReverse(); @@ -234,7 +234,7 @@ int main(int argc, char *argv[]) if ( !sh->IsCoherent(l) ) // just be sure (?) { std::cout << "Files are not coherent. Stop everything " << std::endl; - delete sh; + sh->Delete(); return 0; } } @@ -461,10 +461,10 @@ bool userSuppliedLessThanFunction(gdcm::File *f1, gdcm::File *f2) << elemsToOrderOn[2*ri+1] << std::endl; - e1= f1->gdcm::Document::GetDataEntry( elemsToOrderOn[2*ri], - elemsToOrderOn[2*ri+1]); + e1= f1->GetDataEntry( elemsToOrderOn[2*ri], + elemsToOrderOn[2*ri+1]); - e2= f2->gdcm::Document::GetDataEntry( elemsToOrderOn[2*ri], + e2= f2->GetDataEntry( elemsToOrderOn[2*ri], elemsToOrderOn[2*ri+1]); if(!e2 || !e2) {