X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=8e42f004dfa91d426524ca02ee106f65ef54e751;hb=63b1baaa4ffc54e72247d80978c79456618281ce;hp=71a2ea9c86da0f17b72d5836b491e21ffd2a0b25;hpb=b499c7295859d9f7d25e19162b581ba67917dc69;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 71a2ea9c..8e42f004 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/15 10:40:45 $
-  Version:   $Revision: 1.71 $
+  Date:      $Date: 2005/11/28 11:54:45 $
+  Version:   $Revision: 1.75 $
                                                                                 
   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); 
@@ -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
@@ -351,22 +355,23 @@ int main(int argc, char *argv[])
       // Let's compute 'user friendly' results about 'Orientation'
       // ---------------------------------------------------------
  
-      gdcm::Orientation o;
+      gdcm::Orientation *o = gdcm::Orientation::New();
 
       if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND ||
            strImageOrientationRET     != gdcm::GDCM_UNFOUND )
       {
   
-         gdcm::OrientationType orient = o.GetOrientationType( f );
+         gdcm::OrientationType orient = o->GetOrientationType( f );
  
          std::cout << "TypeOrientation = " << orient << " (-> " 
-                   << o.GetOrientationTypeString(orient) << " )" << std::endl;
+                   << o->GetOrientationTypeString(orient) << " )" << std::endl;
       }
 
-      std::string ori = o.GetOrientation ( f );
+      std::string ori = o->GetOrientation ( f );
       if (ori != "\\" )
          std::cout << "Orientation [" << ori << "]" << std::endl;
  
+       o->gdcm::Orientation::Delete(); 
 //------------------------------
 
 
@@ -398,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);
@@ -468,7 +472,7 @@ int main(int argc, char *argv[])
  
       std::cout<<std::flush;
       f->Delete();
-      delete fh;
+      fh->Delete();
    }
    else  // ====== Deal with a Directory ======
    {
@@ -561,24 +565,26 @@ int main(int argc, char *argv[])
          // Let's compute 'user friendly' results about 'Orientation'
          // ---------------------------------------------------------
     
-         gdcm::Orientation o;
+         gdcm::Orientation *o = gdcm::Orientation::New(); 
+
 
          if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND ||
             strImageOrientationRET     != gdcm::GDCM_UNFOUND )
          {
      
-            gdcm::OrientationType orient = o.GetOrientationType( f );
+            gdcm::OrientationType orient = o->GetOrientationType( f );
     
             std::cout << "TypeOrientation = " << orient << " (-> " 
-                     << o.GetOrientationTypeString(orient) << " )" << std::endl;
+                     << o->GetOrientationTypeString(orient) << " )" << std::endl;
          }
 
-         std::string ori = o.GetOrientation ( f );
+         std::string ori = o->GetOrientation ( f );
          if (ori != "\\" )
             std::cout << "Orientation [" << ori << "]" << std::endl;
+   
+         o->gdcm::Orientation::Delete(); 
 
 //------------------------------- 
-
         
          if (f->IsReadable())
             std::cout <<std::endl<<it->c_str()<<" is Readable"<<std::endl;