X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FclitkDicomInfo.cxx;h=fe2d869d8bbf2e756068ae0b488c30dc45641583;hb=9ca92af37e74225edf0126f865b15f06721119b1;hp=303b1f5cd6056594090f73870d42f363c0e34a1f;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git

diff --git a/tools/clitkDicomInfo.cxx b/tools/clitkDicomInfo.cxx
index 303b1f5..fe2d869 100644
--- a/tools/clitkDicomInfo.cxx
+++ b/tools/clitkDicomInfo.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 /**
    -------------------------------------------------
    * @file   clitkDicomInfo.cxx
@@ -28,6 +28,10 @@
 
 // itk (gdcm) include
 #include "gdcmFile.h"
+#if GDCM_MAJOR_VERSION == 2
+  #include "gdcmReader.h"
+  #include "gdcmPrinter.h"
+#endif
 
 //--------------------------------------------------------------------
 int main(int argc, char * argv[])
@@ -41,11 +45,21 @@ int main(int argc, char * argv[])
 
   // Loop files
   for(unsigned int i=0; i<args_info.inputs_num; i++) {
+#if GDCM_MAJOR_VERSION == 2
+    gdcm::Reader reader;
+    reader.SetFileName(args_info.inputs[i]);
+    reader.Read();
+    gdcm::Printer printer;
+    printer.SetFile(reader.GetFile());
+    printer.SetStyle(gdcm::Printer::VERBOSE_STYLE);
+    printer.Print( std::cout );
+#else
     gdcm::File *header = new gdcm::File();
     header->SetFileName(args_info.inputs[i]);
-    header->SetMaxSizeLoadEntry(16384);
+    header->SetMaxSizeLoadEntry(163840);
     header->Load();
     header->Print();
+#endif
   }
 
   // this is the end my friend