X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmBinEntry.cxx;h=b27d35ccbea7875ad511c3ccfaeea0f1ab84dc40;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=cee3120fdf2c134707c6ba9c6868bcd51b90c8ab;hpb=dc02ed8917f2d871c186f1789bc6bd74bfc15c3b;p=gdcm.git

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index cee3120f..b27d35cc 100644
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/10 14:32:04 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2004/11/30 16:29:01 $
+  Version:   $Revision: 1.41 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -18,44 +18,51 @@
 
 #include "gdcmBinEntry.h"
 #include "gdcmDebug.h"
+#include <fstream>
+#include <iostream> // for std::ios_base, since <ios> does not exist on gcc/Solaris
 
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 
 /**
- * \brief   Constructor from a given gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
+BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
 {
-   VoidArea = NULL;
+   BinArea = 0;
+   SelfArea = true;
 }
 
 /**
- * \brief   Constructor from a given gdcmBinEntry
+ * \brief   Constructor from a given BinEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
+BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
 {
    UsableLength = e->GetLength();
    ReadLength   = e->GetReadLength();
    ImplicitVR   = e->IsImplicitVR();
    Offset       = e->GetOffset();
    PrintLevel   = e->GetPrintLevel();
-   SQDepthLevel = e->GetDepthLevel();
+   //FIXME
+   //SQDepthLevel = e->GetDepthLevel();
 
-   VoidArea = 0; // let's be carefull !
+   BinArea = 0; // let's be carefull !
+   SelfArea = true;
 }
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmBinEntry::~gdcmBinEntry()
+BinEntry::~BinEntry()
 {
-   if (VoidArea)
+   if (BinArea && SelfArea)
    {
-      free (VoidArea);
-      VoidArea = 0; // let's be carefull !
+      delete[] BinArea;
+      BinArea = 0; // let's be carefull !
    }
 }
 
@@ -66,12 +73,13 @@ gdcmBinEntry::~gdcmBinEntry()
  * \brief   canonical Printer
  */
  
-void gdcmBinEntry::Print(std::ostream &os)
+void BinEntry::Print(std::ostream &os)
 {
-   gdcmDocEntry::Print(os);
+   os << "B ";
+   DocEntry::Print(os);
    std::ostringstream s;
-   void *voidArea = GetVoidArea();
-   if (voidArea)
+   void* binArea = GetBinArea();
+   if (binArea)
    {
       //s << " [" << GDCM_BINLOADED 
       s << " [" << GetValue()
@@ -98,20 +106,22 @@ void gdcmBinEntry::Print(std::ostream &os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
 */
-void gdcmBinEntry::Write(FILE *fp, FileType filetype)
+void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
 {
-   gdcmDocEntry::Write(fp, filetype);
-   void *voidArea = GetVoidArea();
+   DocEntry::WriteContent(fp, filetype);
+   void* binArea = GetBinArea();
    int lgr = GetLength();
-   if (voidArea)
+   if (binArea)
    {
       // there is a 'non string' LUT, overlay, etc
-      fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
+      fp->write ( (char*)binArea, lgr ); // Elem value
+      //assert( strlen((char*)binArea) == lgr );
+
    }
    else
    {
     // nothing was loaded, but we need to skip space on disc
-      fseek(fp,(size_t)lgr,SEEK_CUR); 
+      fp->seekp(lgr, std::ios::cur);
    }
 }
 //-----------------------------------------------------------------------------
@@ -119,11 +129,13 @@ void gdcmBinEntry::Write(FILE *fp, FileType filetype)
 
 
 /// \brief Sets the value (non string) of the current Dicom Header Entry
-void gdcmBinEntry::SetVoidArea(void* area)  
+void BinEntry::SetBinArea( uint8_t* area, bool self )  
 { 
-   if (VoidArea)
-      free(VoidArea);
-   VoidArea = area;  
+   if (BinArea && SelfArea)
+      delete[] BinArea;
+
+   BinArea = area;
+   SelfArea=self;
 }
 
 //-----------------------------------------------------------------------------
@@ -133,3 +145,4 @@ void gdcmBinEntry::SetVoidArea(void* area)
 // Private
    
 //-----------------------------------------------------------------------------
+} // end namespace gdcm