ENH: properly handle compiler that does not have __FUNCTION__

[gdcm.git] / src / gdcmBinEntry.cxx

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index b27d35ccbea7875ad511c3ccfaeea0f1ab84dc40..7515f648d1ba0a5a2906fee9e3d922f13f04ebe1 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/30 16:29:01 $
-  Version:   $Revision: 1.41 $
+  Date:      $Date: 2005/01/07 16:45:51 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,7 +30,7 @@ namespace gdcm
 /**
  * \brief   Constructor from a given BinEntry
  */
-BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
+BinEntry::BinEntry(DictEntry *e) : ValEntry(e)
 {
    BinArea = 0;
    SelfArea = true;
@@ -40,13 +40,14 @@ BinEntry::BinEntry(DictEntry* e) : ValEntry(e)
  * \brief   Constructor from a given BinEntry
  * @param   e Pointer to existing Doc entry
  */
-BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry())
+BinEntry::BinEntry(DocEntry *e) : ValEntry(e->GetDictEntry())
 {
-   UsableLength = e->GetLength();
-   ReadLength   = e->GetReadLength();
-   ImplicitVR   = e->IsImplicitVR();
-   Offset       = e->GetOffset();
-   PrintLevel   = e->GetPrintLevel();
+   Copy(e);
+/*   Length     = e->GetLength();
+   ReadLength = e->GetReadLength();
+   ImplicitVR = e->IsImplicitVR();
+   Offset     = e->GetOffset();*/
+
    //FIXME
    //SQDepthLevel = e->GetDepthLevel();
 
@@ -106,7 +107,7 @@ void BinEntry::Print(std::ostream &os)
  * @param fp already open file pointer
  * @param filetype type of the file to be written
 */
-void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
+void BinEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
    DocEntry::WriteContent(fp, filetype);
    void* binArea = GetBinArea();
@@ -115,8 +116,6 @@ void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
    {
       // there is a 'non string' LUT, overlay, etc
       fp->write ( (char*)binArea, lgr ); // Elem value
-      //assert( strlen((char*)binArea) == lgr );
-
    }
    else
    {
@@ -129,7 +128,7 @@ void BinEntry::WriteContent(std::ofstream* fp, FileType filetype)
 
 
 /// \brief Sets the value (non string) of the current Dicom Header Entry
-void BinEntry::SetBinArea( uint8_t* area, bool self )  
+void BinEntry::SetBinArea( uint8_t *area, bool self )  
 { 
    if (BinArea && SelfArea)
       delete[] BinArea;