X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=66fc32a78b880c208240aee4f3a29496c55a0e19;hb=9f274230cc36f77f784729031fbe3e7d576f13ea;hp=ebf6947fc12477124ee21ebfc2bb47f359815d9f;hpb=3ac7a631bee01193732c9ae23e90dc75181697ec;p=gdcm.git

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index ebf6947f..66fc32a7 100644
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/09/09 17:49:25 $
-  Version:   $Revision: 1.23 $
+  Date:      $Date: 2004/09/27 08:39:08 $
+  Version:   $Revision: 1.27 $
                                                                                 
   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
@@ -32,23 +32,20 @@
  */
 gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
 {
-   VoidArea = NULL; // will be in BinEntry ?
 }
 
 /**
  * \brief   Constructor from a given gdcmDocEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
+gdcmValEntry::gdcmValEntry(gdcmDocEntry* e)
+             : gdcmDocEntry(e->GetDictEntry())
 {
    UsableLength = e->GetLength();
    ReadLength   = e->GetReadLength();
    ImplicitVR   = e->IsImplicitVR();
    Offset       = e->GetOffset();
    PrintLevel   = e->GetPrintLevel();
-   SQDepthLevel = e->GetDepthLevel();
-
-   VoidArea = NULL; // will be in BinEntry ?
 }
 
 
@@ -57,11 +54,6 @@ gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
  */
 gdcmValEntry::~gdcmValEntry ()
 {
-   if (!VoidArea)  // will be in BinEntry
-   {
-      free(VoidArea);
-      VoidArea = NULL; // let's be carefull !
-   }
 }
 
 //-----------------------------------------------------------------------------
@@ -179,9 +171,11 @@ void gdcmValEntry::Print(std::ostream & os)
 /*
  * \brief   canonical Writer
  */
-void gdcmValEntry::Write(FILE *fp, FileType filetype)
+void gdcmValEntry::Write(FILE* fp, FileType filetype)
 {
    gdcmDocEntry::Write(fp, filetype);
+
+   //std::cout << "=====================================" << GetVR() << std::endl;
       
    if ( GetGroup() == 0xfffe ) 
    {
@@ -201,7 +195,7 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       for (unsigned int i=0; i<tokens.size();i++)
       {
          uint16_t val_uint16 = atoi(tokens[i].c_str());
-         void *ptr = &val_uint16;
+         void* ptr = &val_uint16;
          fwrite ( ptr,(size_t)2 ,(size_t)1 ,fp);
       }
       tokens.clear();
@@ -219,7 +213,7 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       for (unsigned int i=0; i<tokens.size();i++)
       {
          uint32_t val_uint32 = atoi(tokens[i].c_str());
-         void *ptr = &val_uint32;
+         void* ptr = &val_uint32;
          fwrite ( ptr,(size_t)4 ,(size_t)1 ,fp);
       }
       tokens.clear();