X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestPrintAllDocument.cxx;h=23d5e817bc20dd66275112377a71364bd90a65b0;hb=8629d8b19caf99c82edfc9985fe5ea1ba862b9fd;hp=1b19d7949119d86f5ad1f0449dc826fa048bca12;hpb=ca7638110ded9d3f5283be33b6be6442b397a38f;p=gdcm.git

diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx
index 1b19d794..23d5e817 100644
--- a/Testing/TestPrintAllDocument.cxx
+++ b/Testing/TestPrintAllDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestPrintAllDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/04/07 10:58:51 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/09/15 15:49:21 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,10 +45,10 @@ int TestPrintAllDocument(int argc, char *argv[])
    int swapC;
    unsigned int j;
    std::string pixelType, photomInterp;
-   int l;
+   unsigned int l;
    l = strlen("PALETTE COLOR ");
    
-   //gdcm::Debug::DebugOn();
+   //GDCM_NAME_SPACE::Debug::DebugOn();
    
    while( gdcmDataImages[i] != 0 )
    {
@@ -67,7 +67,7 @@ int TestPrintAllDocument(int argc, char *argv[])
       std::cout << " ----------------------------------------------"
                 << "Begin with " << filename << std::endl;
 
-      gdcm::File *f= gdcm::File::New( );
+      GDCM_NAME_SPACE::File *f= GDCM_NAME_SPACE::File::New( );
       f->SetFileName( filename );
       f->Load();
 
@@ -94,11 +94,13 @@ int TestPrintAllDocument(int argc, char *argv[])
          std::cout << " ";
       std::cout << " Smpl.P.Pix.="          << f->GetSamplesPerPixel()
                 << " Plan.Config.="         << f->GetPlanarConfiguration();
- 
+
       photomInterp =  f->GetEntryString(0x0028,0x0004);               
-      std::cout << " Photom.Interp.="       << photomInterp;
-      for (j=0; j<l-photomInterp.length(); j++)
-         std::cout << " ";
+      std::cout << " Photom.Interp.="       << photomInterp << " l : " << l <<"length : " << photomInterp.length()<< std::endl;
+      
+      if (l > photomInterp.length())
+        for (j=0; j<l-photomInterp.length(); j++)
+           std::cout << " ";
  
       std::cout << " TransferSyntaxName= [" << f->GetTransferSyntaxName() << "]" ;
 
@@ -112,11 +114,11 @@ int TestPrintAllDocument(int argc, char *argv[])
 
       std::string strImageOrientationPatient = 
                                           f->GetEntryString(0x0020,0x0037);
-      if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND )
+      if ( strImageOrientationPatient != GDCM_NAME_SPACE::GDCM_UNFOUND )
       {
-         gdcm::Orientation *o = gdcm::Orientation::New();
+         GDCM_NAME_SPACE::Orientation *o = GDCM_NAME_SPACE::Orientation::New();
  
-         gdcm::OrientationType orient = o->GetOrientationType( f );
+         GDCM_NAME_SPACE::OrientationType orient = o->GetOrientationType( f );
          std::cout << " ---------------------- Orientation " << orient
                    << std::endl;
          o->Delete();