X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=2d2f671f995ff049dc41508f84b1a614dbf05d38;hb=aa0fc6ed66dc186bae363418702f402dc3f0ea21;hp=4b02c55b78d009275ce3ec574fed5d6c7396b587;hpb=c852120fdb6d542d84f74440b68414fdb52178d7;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 4b02c55b..2d2f671f 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/24 16:39:17 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/12/03 11:55:37 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,35 +20,36 @@
 
 int main(int argc, char* argv[])
 {
- 
    gdcm::Header *e1;
    gdcm::File   *f1;
    std::string fileName;   
-   if (argc != 2) {
+   if (argc != 2) 
+   {
       std::cout << " usage : PrintDocument fileName" << std::endl;
    }
 
-   if (argc > 1) {
+   if (argc > 1) 
+   {
       fileName=argv[1];
-   } else {
+   } 
+   else 
+   {
       fileName += GDCM_DATA_ROOT;
       fileName += "/test.acr";
    }
    
    e1= new gdcm::Header( fileName.c_str() );
-
    f1 = new gdcm::File(e1);
 
    e1->SetPrintLevel(2);
-   
    e1->Print();
-      
+
    std::cout << "\n\n" << std::endl; 
 
-   int dataSize = f1->GetImageDataSize();
    std::cout <<std::endl;
-   std::cout <<" dataSize " << dataSize << std::endl;
-   std::cout <<" dataSizeRaw " << f1->GetImageDataSizeRaw() << std::endl;
+   std::cout <<" dataSize " << f1->GetImageDataSize() << std::endl;
+   std::cout <<" dataSizeRaw " << f1->GetImageDataRawSize() << std::endl;
+
    int nX,nY,nZ,sPP,planarConfig;
    std::string pixelType;
    nX=e1->GetXSize();
@@ -74,28 +75,29 @@ int main(int argc, char* argv[])
              << std::endl;
 
   
-  if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) {
-     std::cout << "Transfert Syntax not loaded. " << std::endl
-               << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
-               << std::endl;
+   if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) 
+   {
+      std::cout << "Transfert Syntax not loaded. " << std::endl
+                << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
+                << std::endl;
       return 0;
-  }
+   }
   
    std::string transferSyntaxName = e1->GetTransfertSyntaxName();
    std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
    
-   if (  transferSyntaxName != "Implicit VR - Little Endian"
+/*   if (  transferSyntaxName != "Implicit VR - Little Endian"
       && transferSyntaxName != "Explicit VR - Little Endian"     
       && transferSyntaxName != "Deflated Explicit VR - Little Endian"      
       && transferSyntaxName != "Explicit VR - Big Endian"
       && transferSyntaxName != "Uncompressed ACR-NEMA"     )
-  {
+   {
       std::cout << std::endl << "==========================================="
                   << std::endl; 
-         f1->GetPixelConverter()->Print();
+         f1->GetPixelReadConverter()->Print();
       std::cout << std::endl << "==========================================="
                   << std::endl; 
-   }      
+   }*/
    
    if(e1->IsReadable())
       std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;