To avoid bcc 5.5 warnings

diff --git a/Testing/TestPrintAllDocument.cxx b/Testing/TestPrintAllDocument.cxx
index 2122494fec91e46b6d52df44ba212cac1ada708b..31ce5c9dae3db27882962e8790f04d0837059ec8 100644 (file)
--- a/Testing/TestPrintAllDocument.cxx
+++ b/Testing/TestPrintAllDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestPrintAllDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/07 08:48:28 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2005/09/16 17:19:24 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,7 +32,7 @@
 #include "gdcmSeqEntry.h" 
 #include "gdcmSQItem.h" 
 #include "gdcmValEntry.h" 
-
+#include "gdcmOrientation.h"
 #include <fstream>
 #include <iostream>
 #include <iomanip> // for std::ios::left, ...
@@ -55,12 +55,12 @@ int TestPrintAllDocument(int, char *[])
       filename += "/";  //doh!
       filename += gdcmDataImages[i];
 
-      gdcm::File *e1= new gdcm::File( );
-      e1->SetFileName( filename );
-      e1->Load();
+      gdcm::File *f= new gdcm::File( );
+      f->SetFileName( filename );
+      f->Load();
 
-      e1->SetPrintLevel(2);
-      e1->Print();
+      f->SetPrintLevel(2);
+      f->Print();
       // just to be able to grep the display result, for some usefull info
  
       //s.setf(std::ios::left);
@@ -77,29 +77,39 @@ int TestPrintAllDocument(int, char *[])
       for (j=0; j<nbSpaces; j++)
          std::cout << " ";    
 
-      pixelType = e1->GetPixelType();
+      pixelType = f->GetPixelType();
       std::cout << " pixelType="            << pixelType;
       if ( pixelType == "8U" || pixelType == "8S" )
          std::cout << " ";
-      std::cout << " Smpl.P.Pix.="          << e1->GetSamplesPerPixel()
-                << " Plan.Config.="         << e1->GetPlanarConfiguration();
+      std::cout << " Smpl.P.Pix.="          << f->GetSamplesPerPixel()
+                << " Plan.Config.="         << f->GetPlanarConfiguration();
  
-      photomInterp =  e1->GetEntryValue(0x0028,0x0004);               
+      photomInterp =  f->GetEntryValue(0x0028,0x0004);               
       std::cout << " Photom.Interp.="       << photomInterp;
       for (j=0; j<l-photomInterp.length(); j++)
          std::cout << " ";
  
-      std::cout << " TransferSyntaxName= [" << e1->GetTransferSyntaxName() << "]" ;
+      std::cout << " TransferSyntaxName= [" << f->GetTransferSyntaxName() << "]" ;
 
-      swapC = e1->GetSwapCode();
+      swapC = f->GetSwapCode();
       if ( swapC != 1234 )
-          std::cout << " SwapCode = "       << e1->GetSwapCode(); 
-      if ( e1->CheckIfEntryExist(0x0088,0x0200) )
+          std::cout << " SwapCode = "       << f->GetSwapCode(); 
+      if ( f->CheckIfEntryExist(0x0088,0x0200) )
           std::cout << " Icon Image Sequence";
 
-       std::cout << std::endl;
-   
-      if( e1->IsReadable() )
+      std::cout << std::endl;
+
+      std::string strImageOrientationPatient = 
+                                          f->GetEntryValue(0x0020,0x0037);
+      if ( strImageOrientationPatient != gdcm::GDCM_UNFOUND )
+      {
+         gdcm::Orientation o;
+         double orient = o.TypeOrientation( f );
+         std::cout << " ---------------------- Orientation " << orient
+                   << std::endl;
+      }
+
+      if( f->IsReadable() )
       {
          std::cout <<filename << " is Readable" 
                    << std::endl << std::endl;
@@ -108,10 +118,10 @@ int TestPrintAllDocument(int, char *[])
       {
          std::cout << filename << " is NOT Readable" 
                    << std::endl << std::endl;
-         delete e1;
+         delete f;
          return 1;
       }
-      delete e1;
+      delete f;
       i++;
    }
    return 0;

diff --git a/Testing/VTKTestRead.cxx b/Testing/VTKTestRead.cxx
index f17b7512e71605fa86e655b58349d3f10b3085fa..aff471031881c4a90059c922b9c925feaf92e6fa 100644 (file)
--- a/Testing/VTKTestRead.cxx
+++ b/Testing/VTKTestRead.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestRead.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/09 15:31:15 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/09/16 17:19:24 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -39,7 +39,7 @@ int VTKReadTest(vtkTesting *t,vtkImageViewer *viewer,
                 std::string const &filename, 
                 std::string const &referenceFileName)
 {
-   int retVal = 0;  //by default this is an error
+   int retVal; // = 0; (to avoid bcc5.5 warnings)
 
    t->CleanArguments();
    t->AddArgument("-D");

diff --git a/Testing/VTKTestReadSeq.cxx b/Testing/VTKTestReadSeq.cxx
index 7cd5166ad8a6d5418d0a1b5fd5a149c0b9ebffbd..56d3d24c1b72c7ec48a228826d9e4fa278b82613 100644 (file)
--- a/Testing/VTKTestReadSeq.cxx
+++ b/Testing/VTKTestReadSeq.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: VTKTestReadSeq.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/09 15:31:15 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/09/16 17:19:25 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,7 +37,7 @@ int VTKReadSeqTest(vtkTesting *t, vtkImageViewer *viewer,
                    std::string const &filename, 
                    std::string const &referenceFileName)
 {
-   int retVal = 0;  //by default this is an error
+   int retVal; // = 0;  (to avoid bcc 5.5 warnings)
 
    // Set the reader   
    vtkGdcmReader *reader = vtkGdcmReader::New();

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 66d8dbbec68fa84d5a1952bc6fa6be5786f7cc49..23766c4ba3576f64d4aeedaa8dd33c229840f8f6 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/08 15:10:46 $
-  Version:   $Revision: 1.278 $
+  Date:      $Date: 2005/09/16 17:19:26 $
+  Version:   $Revision: 1.279 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -964,9 +964,10 @@ void Document::ParseDES(DocEntrySet *set, long offset,
    BinEntry *newBinEntry;
    SeqEntry *newSeqEntry;
    VRKey vr;
-   bool used;
+   bool used; // will be set to false when something wrong happens to an Entry.
+              // (Entry will then be deleted)
    bool delim_mode_intern = delim_mode;
-   bool first = true;
+   bool first = true;  
    while (true)
    {
       if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
@@ -1111,7 +1112,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
                }
             }
 
-            bool delimitor=newValEntry->IsItemDelimitor();
+            bool delimitor = newValEntry->IsItemDelimitor();
 
             if ( (delimitor) || 
                 (!delim_mode && ((long)(Fp->tellg())-offset) >= l_max) )

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index d4410d04aa28812ae84f429ef5d6398e09de174b..cb2bb4b25cf19b7166474e0bf83eece58cf12639 100644 (file)
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: vtkGdcmReader.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/09/08 15:09:08 $
-  Version:   $Revision: 1.82 $
+  Date:      $Date: 2005/09/16 17:19:27 $
+  Version:   $Revision: 1.83 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -69,7 +69,7 @@
 #include <vtkPointData.h>
 #include <vtkLookupTable.h>
 
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.82 $")
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.83 $")
 vtkStandardNewMacro(vtkGdcmReader)
 
 //-----------------------------------------------------------------------------
@@ -771,7 +771,8 @@ void vtkGdcmReader::LoadImageInMemory(
    
    if( fileH->GetFile()->HasLUT() && AllowLookupTable )
    {
-      size               = fileH->GetImageDataSize();
+      // to avoid bcc 5.5 w
+      /*size               = */ fileH->GetImageDataSize(); 
       src                = (unsigned char*) fileH->GetImageDataRaw();
       unsigned char *lut = (unsigned char*) fileH->GetLutRGBA();