* src/gdcmDocument.cxx ftell() return properly stored in a long (i.e.

[gdcm.git] / Example / PrintHeader.cxx

diff --git a/Example/PrintHeader.cxx b/Example/PrintHeader.cxx
index 49cd54e7ba7937ed4738189eebebbda60ce38161..201cb3c90cc39ecfc36c3136431a25bed9055af0 100644 (file)
--- a/Example/PrintHeader.cxx
+++ b/Example/PrintHeader.cxx
@@ -3,33 +3,25 @@
 
 int main(int argc, char* argv[])
 { 
-   bool dropPriv = false;
-   bool showSeq  = true; 
    std::string fileName;   
 
-   if (argc == 1) {
-      std::cout << argv[0] <<
-      " fileName" << std::endl <<
-      "    [nopriv]  if you don't want to print Shadow groups"  << std::endl <<
-      "    [noseq]   if you don't want to 'go inside' the SQ's" << std::endl;
+   if (argc == 1)
+   {
+      std::cout << argv[0] << " fileName" << std::endl;
    }
 
-   if (argc > 1) {
+   if (argc > 1)
+   {
       fileName=argv[1];
-   } else {
+   }
+   else
+   {
       fileName += GDCM_DATA_ROOT;
       fileName += "/test.acr";
    }
    
-   for (int j=0;j<argc;j++) {
-      if (strcmp(argv[j],"nopriv")==0)
-         dropPriv=true;
-      else if (strcmp(argv[j],"noseq")==0)
-         showSeq=false;
-   }
-   
-   gdcmFile *e2 = new gdcmFile(fileName.c_str(),false, showSeq, dropPriv);
-   gdcmHeader *e1 = e2->GetHeader();  
+   gdcm::File *e2 = new gdcm::File( fileName.c_str() );
+   gdcm::Header *e1 = e2->GetHeader();  
         
    if (argc > 2) {
       int level = atoi(argv[2]);   
@@ -38,7 +30,15 @@ int main(int argc, char* argv[])
 
   e1->Print();   
       
-  std::cout << "\n\n" << std::endl;      
+  std::cout << "\n\n" << std::endl; 
+  
+  if ( e1->GetEntryByNumber(0x0002,0x0010) == 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;
    
@@ -46,11 +46,11 @@ int main(int argc, char* argv[])
       && transferSyntaxName != "Explicit VR - Little Endian"     
       && transferSyntaxName != "Deflated Explicit VR - Little Endian"      
       && transferSyntaxName != "Explicit VR - Big Endian"
-      && transferSyntaxName != "Uncompressed ACR-NEMA"     )
+      && transferSyntaxName != "Uncompressed ACR-NEMA" )
   {
   std::cout << std::endl << "==========================================="
                   << std::endl; 
-        e2->ParsePixelData();
+        e2->GetPixelConverter()->Print();
   std::cout << std::endl << "==========================================="
                   << std::endl; 
   }