X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=a8c61272cae5bfee80e249794a850508cd0749a0;hb=2b5ddcb309843e22272eca54f9cc19970e3d1fd9;hp=3cd654f92d9b87e9a559a6f5ea57fd2c0fb105a8;hpb=4fbe563dc18455266f880586fa2aca2cfb1012bc;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 3cd654f9..a8c61272 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/18 11:45:34 $
-  Version:   $Revision: 1.72 $
+  Date:      $Date: 2006/01/26 15:52:43 $
+  Version:   $Revision: 1.79 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,7 +49,6 @@ void ShowLutData(gdcm::File *f)
          std::string lutDescriptor = sqi->GetEntryString(0x0028,0x3002);
          if (   /*lutDescriptor   == GDCM_UNFOUND*/ 0 )
          {
-            //gdcmWarningMacro( "LUT Descriptor is missing" );
             std::cout << "LUT Descriptor is missing" << std::endl;
             return;
          }
@@ -68,8 +67,7 @@ void ShowLutData(gdcm::File *f)
                   << std::endl;
          if ( nbRead != 3 )
          {
-               //gdcmWarningMacro( "Wrong LUT descriptor" );
-               std::cout << "Wrong LUT descriptor" << std::endl;
+            std::cout << "Wrong LUT descriptor" << std::endl;
          }
          //LUT Data (CTX dependent)    
          gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006); 
@@ -153,8 +151,8 @@ int main(int argc, char *argv[])
       return 1;
    }
 
-   char *fileName = am->ArgMgrGetString("filein",(char *)0);
-   char *dirName  = am->ArgMgrGetString("dirin",(char *)0);
+   const char *fileName = am->ArgMgrGetString("filein");
+   const char *dirName  = am->ArgMgrGetString("dirin");
 
    if ( (fileName == 0 && dirName == 0) ||
         (fileName != 0 && dirName != 0) )
@@ -178,7 +176,7 @@ int main(int argc, char *argv[])
       loadMode |= gdcm::LD_NOSHADOWSEQ;
    else 
    {
-   if ( am->ArgMgrDefined("noshadow") )
+      if ( am->ArgMgrDefined("noshadow") )
          loadMode |= gdcm::LD_NOSHADOW;
       if ( am->ArgMgrDefined("noseq") )
          loadMode |= gdcm::LD_NOSEQ;
@@ -193,11 +191,11 @@ int main(int argc, char *argv[])
    bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
 
    bool ddict = am->ArgMgrDefined("dict") ? true : false;
-   char *dict = 0;
+   const char *dict = 0;
 
    if (ddict)
    {
-     dict = am->ArgMgrGetString("dict",(char *)0);
+     dict = am->ArgMgrGetString("dict",0);
    }
 
    /* if unused Param we give up */
@@ -229,6 +227,12 @@ int main(int argc, char *argv[])
          f->AddForceLoadElement((uint32_t)elemsToForceLoad[2*ri], 
                                 (uint32_t)elemsToForceLoad[2*ri+1] ); 
       }
+// TODO : find why such a polution
+// To avoid polluting the output with messages 
+// 'Last system error was : No such file or directory'
+
+errno = 0; 
+
 
       bool res = f->Load();
       // gdcm::File::IsReadable() is no usable here, because we deal with
@@ -367,7 +371,7 @@ int main(int argc, char *argv[])
       if (ori != "\\" )
          std::cout << "Orientation [" << ori << "]" << std::endl;
  
-       o->gdcm::Orientation::Delete(); 
+      o->Delete();  
 //------------------------------
 
 
@@ -399,7 +403,6 @@ int main(int argc, char *argv[])
                                      &length, &deb, &nbits );
                   if ( nbRead != 3 )
                   {
-                      //gdcmWarningMacro( "Wrong LUT descriptor" );
                       std::cout << "Wrong LUT descriptor" << std::endl;
                   }                                                  
                   gdcm::DataEntry *b = sqi->GetDataEntry(0x0028,0x3006);
@@ -469,7 +472,7 @@ int main(int argc, char *argv[])
  
       std::cout<<std::flush;
       f->Delete();
-      delete fh;
+      fh->Delete();
    }
    else  // ====== Deal with a Directory ======
    {
@@ -541,7 +544,7 @@ int main(int argc, char *argv[])
          if ( strPatientOrientation != gdcm::GDCM_UNFOUND
          && strPatientOrientation != "")  
             std::cout << "PatientOrientation (0x0020,0x0020)= [" 
-                     << strPatientOrientation << "]" << std::endl;
+                      << strPatientOrientation << "]" << std::endl;
 
          std::string strImageOrientationPatient = 
                                        f->GetEntryString(0x0020,0x0037);  
@@ -578,8 +581,7 @@ int main(int argc, char *argv[])
          std::string ori = o->GetOrientation ( f );
          if (ori != "\\" )
             std::cout << "Orientation [" << ori << "]" << std::endl;
-   
-         o->gdcm::Orientation::Delete(); 
+         o->Delete(); 
 
 //-------------------------------