* FIX : remove so many friend between classes

   -- BeNours

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 7686c6b10bcad748ee623acce7131c2f011ce79c..dfe33bb3b45828e4c5936d1db7e94f5235624c85 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/01/26 11:42:02 $
-  Version:   $Revision: 1.212 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  Version:   $Revision: 1.213 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -2330,14 +2330,14 @@ void Document::ComputeRLEInfo()
        SkipBytes(rleSegmentLength[nbRleSegments]);
 
        // Store the collected info
-       RLEFrame *newFrameInfo = new RLEFrame;
-       newFrameInfo->SetNumberOfFragments(nbRleSegments);
+       RLEFrame *newFrame = new RLEFrame;
+       newFrame->SetNumberOfFragments(nbRleSegments);
        for( unsigned int uk = 1; uk <= nbRleSegments; uk++ )
        {
-          newFrameInfo->SetOffset(uk,frameOffset + rleSegmentOffsetTable[uk]);
-          newFrameInfo->SetLength(uk,rleSegmentLength[uk]);
+          newFrame->SetOffset(uk,frameOffset + rleSegmentOffsetTable[uk]);
+          newFrame->SetLength(uk,rleSegmentLength[uk]);
        }
-       RLEInfo->Frames.push_back( newFrameInfo );
+       RLEInfo->AddFrame(newFrame);
    }
 
    // Make sure that at the end of the item we encounter a 'Sequence
@@ -2376,9 +2376,9 @@ void Document::ComputeJPEGFragmentInfo()
        JPEGFragment *newFragment = new JPEGFragment;
        newFragment->SetOffset(fragmentOffset);
        newFragment->SetLength(fragmentLength);
-       JPEGInfo->Fragments.push_back( newFragment );
+       JPEGInfo->AddFragment(newFragment);
 
-       SkipBytes( fragmentLength );
+       SkipBytes(fragmentLength);
    }
 
    // Make sure that at the end of the item we encounter a 'Sequence

diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx
index 9d8e8f440499036f1e16f7e360de94c91641962a..a1cfd210b9f1a45ec058f9f9efce5cb1fd65acd7 100644 (file)
--- a/src/gdcmFileHelper.cxx
+++ b/src/gdcmFileHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFileHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 15:44:24 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -958,7 +958,7 @@ void FileHelper::Initialize()
 
    if ( FileInternal->IsReadable() )
    {
-      PixelReadConverter->GrabInformationsFromHeader( FileInternal );
+      PixelReadConverter->GrabInformationsFromFile( FileInternal );
    }
 }
 

diff --git a/src/gdcmJPEGFragmentsInfo.cxx b/src/gdcmJPEGFragmentsInfo.cxx
index 77532a69ce6f2eebfd6febb018483887850599e5..6adb33f0220e95237489ac9e53b0b9bfbd01cb2c 100644 (file)
--- a/src/gdcmJPEGFragmentsInfo.cxx
+++ b/src/gdcmJPEGFragmentsInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 11:42:02 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  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
@@ -23,9 +23,10 @@ namespace gdcm
 {
 
 JPEGFragmentsInfo::JPEGFragmentsInfo()
-  {
-  StateSuspension = 0;
-  }
+{
+   StateSuspension = 0;
+}
+
 /**
  * \brief Default destructor
  */
@@ -128,5 +129,10 @@ void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t
    }
 }
 
+void JPEGFragmentsInfo::AddFragment(JPEGFragment *fragment)
+{
+   Fragments.push_back(fragment);
+}
+
 } // end namespace gdcm
 

diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h
index 4f2f430193f5fb8e63eb63cdda2bb9a75d4e0dec..95101cb07331760c0f448ad8dd2202ac73d1362e 100644 (file)
--- a/src/gdcmJPEGFragmentsInfo.h
+++ b/src/gdcmJPEGFragmentsInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 11:42:02 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,7 +27,6 @@
 
 namespace gdcm 
 {
-
 /**
  * \brief Utility class for gathering the informations of the collection
  *        of JPEG fragment[s] (see \ref JPEGFragment)  when handling
@@ -50,8 +49,10 @@ public:
 
    void DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int numBytes, int length);
 
+   void AddFragment(JPEGFragment *fragment);
+
 private:
-   typedef std::list< JPEGFragment* > JPEGFragmentsList;
+   typedef std::list<JPEGFragment *> JPEGFragmentsList;
 
     //Some mathieu hack:
    int StateSuspension;
@@ -59,7 +60,6 @@ private:
    char* pimage;
    JPEGFragmentsList Fragments;
 
-   friend class Document;
    friend class PixelReadConvert;
 };
 } // end namespace gdcm

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index b94a76a82cb57149e26450a1673bafd2d0dd37bb..300bedb3f4a5397ec19d2d2545f91c1cce108281 100644 (file)
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 11:42:02 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  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
@@ -50,21 +50,15 @@ PixelReadConvert::PixelReadConvert()
 void PixelReadConvert::Squeeze() 
 {
    if ( RGB )
-   {
       delete [] RGB;
-   } 
    RGB = 0;
 
    if ( Raw )
-   {
       delete [] Raw;
-   }
    Raw = 0;
 
    if ( LutRGBA )
-   {
       delete [] LutRGBA;
-   }
    LutRGBA = 0;
 }
 
@@ -75,18 +69,16 @@ PixelReadConvert::~PixelReadConvert()
 
 void PixelReadConvert::AllocateRGB()
 {
-  if ( RGB ) {
+  if ( RGB )
      delete [] RGB;
-  }
-  RGB = new uint8_t[ RGBSize ];
+  RGB = new uint8_t[RGBSize];
 }
 
 void PixelReadConvert::AllocateRaw()
 {
-  if ( Raw ) {
+  if ( Raw )
      delete [] Raw;
-  }
-  Raw = new uint8_t[ RawSize ];
+  Raw = new uint8_t[RawSize];
 }
 
 /**
@@ -155,7 +147,7 @@ bool PixelReadConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames )
    // per pixel we cannot work in place within Raw and hence
    // we copy it in a safe place, say copyRaw.
 
-   uint8_t* copyRaw = new uint8_t[ rawSize * 2 ];
+   uint8_t* copyRaw = new uint8_t[rawSize * 2];
    memmove( copyRaw, Raw, rawSize * 2 );
 
    uint8_t* x = Raw;
@@ -664,7 +656,7 @@ void PixelReadConvert::ConvertRGBPlanesToRGBPixels()
 bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
 {
    // ComputeRawAndRGBSizes is already made by 
-   // ::GrabInformationsFromHeader. So, the structure sizes are
+   // ::GrabInformationsFromfile. So, the structure sizes are
    // correct
    Squeeze();
 
@@ -852,41 +844,41 @@ void PixelReadConvert::ComputeRawAndRGBSizes()
    }
 }
 
-void PixelReadConvert::GrabInformationsFromHeader( File *header )
+void PixelReadConvert::GrabInformationsFromFile( File *file )
 {
    // Number of Bits Allocated for storing a Pixel is defaulted to 16
-   // when absent from the header.
-   BitsAllocated = header->GetBitsAllocated();
+   // when absent from the file.
+   BitsAllocated = file->GetBitsAllocated();
    if ( BitsAllocated == 0 )
    {
       BitsAllocated = 16;
    }
 
    // Number of "Bits Stored", defaulted to number of "Bits Allocated"
-   // when absent from the header.
-   BitsStored = header->GetBitsStored();
+   // when absent from the file.
+   BitsStored = file->GetBitsStored();
    if ( BitsStored == 0 )
    {
       BitsStored = BitsAllocated;
    }
 
    // High Bit Position, defaulted to "Bits Allocated" - 1
-   HighBitPosition = header->GetHighBitPosition();
+   HighBitPosition = file->GetHighBitPosition();
    if ( HighBitPosition == 0 )
    {
       HighBitPosition = BitsAllocated - 1;
    }
 
-   XSize = header->GetXSize();
-   YSize = header->GetYSize();
-   ZSize = header->GetZSize();
-   SamplesPerPixel = header->GetSamplesPerPixel();
-   PixelSize = header->GetPixelSize();
-   PixelSign = header->IsSignedPixelData();
-   SwapCode  = header->GetSwapCode();
-   std::string ts = header->GetTransferSyntax();
+   XSize = file->GetXSize();
+   YSize = file->GetYSize();
+   ZSize = file->GetZSize();
+   SamplesPerPixel = file->GetSamplesPerPixel();
+   PixelSize = file->GetPixelSize();
+   PixelSign = file->IsSignedPixelData();
+   SwapCode  = file->GetSwapCode();
+   std::string ts = file->GetTransferSyntax();
    IsRaw =
-        ( ! header->IsDicomV3() )
+        ( ! file->IsDicomV3() )
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndianDLXGE
      || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRLittleEndian
@@ -899,25 +891,25 @@ void PixelReadConvert::GrabInformationsFromHeader( File *header )
    IsJPEGLossless  = Global::GetTS()->IsJPEGLossless(ts);
    IsRLELossless   = Global::GetTS()->IsRLELossless(ts);
 
-   PixelOffset     = header->GetPixelOffset();
-   PixelDataLength = header->GetPixelAreaLength();
-   RLEInfo  = header->GetRLEInfo();
-   JPEGInfo = header->GetJPEGInfo();
-                                                                             
-   PlanarConfiguration = header->GetPlanarConfiguration();
-   IsMonochrome = header->IsMonochrome();
-   IsPaletteColor = header->IsPaletteColor();
-   IsYBRFull = header->IsYBRFull();
+   PixelOffset     = file->GetPixelOffset();
+   PixelDataLength = file->GetPixelAreaLength();
+   RLEInfo  = file->GetRLEInfo();
+   JPEGInfo = file->GetJPEGInfo();
+
+   PlanarConfiguration = file->GetPlanarConfiguration();
+   IsMonochrome = file->IsMonochrome();
+   IsPaletteColor = file->IsPaletteColor();
+   IsYBRFull = file->IsYBRFull();
 
    /////////////////////////////////////////////////////////////////
    // LUT section:
-   HasLUT = header->HasLUT();
+   HasLUT = file->HasLUT();
    if ( HasLUT )
    {
       // Just in case some access to a File element requires disk access.
-      LutRedDescriptor   = header->GetEntryValue( 0x0028, 0x1101 );
-      LutGreenDescriptor = header->GetEntryValue( 0x0028, 0x1102 );
-      LutBlueDescriptor  = header->GetEntryValue( 0x0028, 0x1103 );
+      LutRedDescriptor   = file->GetEntryValue( 0x0028, 0x1101 );
+      LutGreenDescriptor = file->GetEntryValue( 0x0028, 0x1102 );
+      LutBlueDescriptor  = file->GetEntryValue( 0x0028, 0x1103 );
    
       // Depending on the value of Document::MAX_SIZE_LOAD_ELEMENT_VALUE
       // [ refer to invocation of Document::SetMaxSizeLoadEntry() in
@@ -934,24 +926,24 @@ void PixelReadConvert::GrabInformationsFromHeader( File *header )
       ///       parsed from. Fix that. FIXME.
    
       ////// Red round
-      header->LoadEntryBinArea(0x0028, 0x1201);
-      LutRedData = (uint8_t*)header->GetEntryBinArea( 0x0028, 0x1201 );
+      file->LoadEntryBinArea(0x0028, 0x1201);
+      LutRedData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1201 );
       if ( ! LutRedData )
       {
          gdcmVerboseMacro( "Unable to read Red LUT data" );
       }
 
       ////// Green round:
-      header->LoadEntryBinArea(0x0028, 0x1202);
-      LutGreenData = (uint8_t*)header->GetEntryBinArea(0x0028, 0x1202 );
+      file->LoadEntryBinArea(0x0028, 0x1202);
+      LutGreenData = (uint8_t*)file->GetEntryBinArea(0x0028, 0x1202 );
       if ( ! LutGreenData)
       {
          gdcmVerboseMacro( "Unable to read Green LUT data" );
       }
 
       ////// Blue round:
-      header->LoadEntryBinArea(0x0028, 0x1203);
-      LutBlueData = (uint8_t*)header->GetEntryBinArea( 0x0028, 0x1203 );
+      file->LoadEntryBinArea(0x0028, 0x1203);
+      LutBlueData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1203 );
       if ( ! LutBlueData )
       {
          gdcmVerboseMacro( "Unable to read Blue LUT data" );
@@ -1042,9 +1034,8 @@ void PixelReadConvert::BuildLUTRGBA()
    // forge the 4 * 8 Bits Red/Green/Blue/Alpha LUT
    LutRGBA = new uint8_t[ 1024 ]; // 256 * 4 (R, G, B, Alpha)
    if ( !LutRGBA )
-   {
       return;
-   }
+
    memset( LutRGBA, 0, 1024 );
                                                                                 
    int mult;

diff --git a/src/gdcmPixelReadConvert.h b/src/gdcmPixelReadConvert.h
index a9839600053cf50dc5af3d8ce7f1de74f3e491e8..db5556d414c60ebc504211294d3a2ba2436e0e8d 100644 (file)
--- a/src/gdcmPixelReadConvert.h
+++ b/src/gdcmPixelReadConvert.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/23 10:12:34 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -53,7 +53,7 @@ public:
    void Print( std::ostream &os = std::cout, std::string const & indent = "" );
 
 // In progress
-   void GrabInformationsFromHeader( File *f );
+   void GrabInformationsFromFile( File *file );
    bool ReadAndDecompressPixelData( std::ifstream *fp );
    void Squeeze();
    bool BuildRGBImage();

diff --git a/src/gdcmRLEFramesInfo.cxx b/src/gdcmRLEFramesInfo.cxx
index 361f451aa1f1c208da259e29f59a5afe6feb4279..c79bc22ae73a2160e84f94a4484dc778c4fe210c 100644 (file)
--- a/src/gdcmRLEFramesInfo.cxx
+++ b/src/gdcmRLEFramesInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 16:10:53 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -54,4 +54,9 @@ void RLEFramesInfo::Print( std::ostream &os, std::string indent )
    }
 }
 
+void RLEFramesInfo::AddFrame(RLEFrame *frame)
+{
+   Frames.push_back(frame);
+}
+
 } // end namespace gdcm

diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index a448b69ab9abd02238e6c26adab99aafc0fd4034..a88a670ad4e5e639625e8ee0a880471fba693f82 100644 (file)
--- a/src/gdcmRLEFramesInfo.h
+++ b/src/gdcmRLEFramesInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 11:42:02 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/01/26 16:28:58 $
+  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
@@ -26,7 +26,6 @@
 
 namespace gdcm 
 {
-
 /**
  * \brief Utility class for gathering the informations of the collection
  *        of RLE frame[s] (see \ref RLEFrame)  when handling
@@ -47,12 +46,13 @@ public:
    ~RLEFramesInfo();
    void Print( std::ostream &os = std::cout, std::string indent = "" );
 
+   void AddFrame(RLEFrame *frame);
+
 private:
-   typedef std::list< RLEFrame* > RLEFrameList;
+   typedef std::list<RLEFrame *> RLEFrameList;
 
    RLEFrameList Frames;
 
-   friend class Document;
    friend class PixelReadConvert;
 };
 } // end namespace gdcm