X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=df97372165317e45e345f06b589416890bfb73dc;hb=910e35c51c25f53b00f7d1a126ae51a71474d0ab;hp=d2d4cd851372c23694c147836eb3d7e86f8edb69;hpb=52ba6bb4e5637b596243b4efd4b24de0dfebe88f;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index d2d4cd85..df973721 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/04/27 14:54:56 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/05/04 07:29:17 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -44,12 +44,16 @@ int main(int argc, char *argv[])
 
    if (argc > 3)
       gdcm::Debug::DebugOn();
-
+ 
+   bool res; 
    if (argc > 4)
-      e1->SetLoadMode(NO_SEQ | NO_SHADOW);   
-   e1->Load( fileName.c_str() );
+      e1->SetLoadMode(NO_SEQ | NO_SHADOW); 
 
-   if ( !e1->gdcm::Document::IsReadable() )
+   // gdcm::File::IsReadable() is no usable here, because we deal with
+   // any kind of gdcm-Parsable *document* 
+   // not only gdcm::File (as opposed to gdcm::DicomDir)
+   res = e1->Load( fileName.c_str() );
+   if ( !res )
    {
       delete e1;
       return 0;
@@ -68,7 +72,7 @@ int main(int argc, char *argv[])
    std::cout << "\n\n" << std::endl; 
 
    std::cout <<std::endl;
-   std::cout <<" dataSize " << f1->GetImageDataSize() << std::endl;
+   std::cout <<" dataSize    " << f1->GetImageDataSize()    << std::endl;
    std::cout <<" dataSizeRaw " << f1->GetImageDataRawSize() << std::endl;
 
    int nX,nY,nZ,sPP,planarConfig;
@@ -82,7 +86,7 @@ int main(int argc, char *argv[])
    sPP          = e1->GetSamplesPerPixel();
    planarConfig = e1->GetPlanarConfiguration();
    
-   std::cout << " pixelType= ["           << pixelType 
+   std::cout << " pixelType= ["            << pixelType 
              << "] SamplesPerPixel= ["     << sPP
              << "] PlanarConfiguration= [" << planarConfig 
              << "] "<< std::endl