ENH: update jpeg lib with ls patch and 2 bugfix patch

[gdcm.git] / src / gdcmValEntry.cxx

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 2ab55cbfaf39685372e476628e464dde7c47ed3d..aaf16de4d076b6fd718fe6352df86048d173a7f6 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 00:59:22 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/10/12 04:35:48 $
+  Version:   $Revision: 1.30 $
                                                                                 
   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
@@ -21,47 +21,42 @@
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
 
+namespace gdcm 
+{
+
 // CLEAN ME
 #define MAX_SIZE_PRINT_ELEMENT_VALUE 128
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief   Constructor from a given gdcmDictEntry
+ * \brief   Constructor from a given DictEntry
  * @param   e Pointer to existing dictionary entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
+ValEntry::ValEntry(DictEntry* e) : DocEntry(e)
 {
-   voidArea = NULL; // will be in BinEntry ?
 }
 
 /**
- * \brief   Constructor from a given gdcmDocEntry
+ * \brief   Constructor from a given DocEntry
  * @param   e Pointer to existing Doc entry
  */
-gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
+ValEntry::ValEntry(DocEntry* e)
+             : DocEntry(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 ?
+   PrintLevel   = e->GetPrintLevel();
 }
 
 
 /**
  * \brief   Canonical destructor.
  */
-gdcmValEntry::~gdcmValEntry ()
+ValEntry::~ValEntry ()
 {
-   if (!voidArea)  // will be in BinEntry
-   {
-      free(voidArea);
-      voidArea = NULL; // let's be carefull !
-   }
 }
 
 //-----------------------------------------------------------------------------
@@ -69,17 +64,17 @@ gdcmValEntry::~gdcmValEntry ()
 /**
  * \brief   canonical Printer
  */
-void gdcmValEntry::Print(std::ostream & os)
+void ValEntry::Print(std::ostream & os)
 {
    uint16_t g = GetGroup();
    uint16_t e = GetElement();
    std::string vr = GetVR();
    std::ostringstream s; 
-   char st[20];
+   std::string st;
    TSKey v;
    std::string d2;
      
-   gdcmDocEntry::Print(os); 
+   DocEntry::Print(os); 
 
    if (g == 0xfffe)
    {
@@ -87,12 +82,13 @@ void gdcmValEntry::Print(std::ostream & os)
       return;
    }
    
-   gdcmTS * ts = gdcmGlobal::GetTS();
+   TS * ts = Global::GetTS();
     
    v  = GetValue();  // not applicable for SQ ...     
-   d2 = CreateCleanString(v);  // replace non printable characters by '.'            
+   d2 = Util::CreateCleanString(v);  // replace non printable characters by '.'            
    if( (GetLength()<=MAX_SIZE_PRINT_ELEMENT_VALUE) || 
-       (printLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
+       //(PrintLevel>=3)  || (d2.find("gdcm::NotLoaded.") < d2.length()) )
+       (PrintLevel>=3)  || (d2.find(GDCM_NOTLOADED) < d2.length()) )
    {
       s << " [" << d2 << "]";
    }
@@ -157,17 +153,17 @@ void gdcmValEntry::Print(std::ostream & os)
    {
       if (v == "4294967295") // to avoid troubles in convertion 
       {
-         sprintf (st," x(ffffffff)");
+         st = Util::Format(" x(ffffffff)");
       }
       else
       {
          if ( GetLength() !=0 )
          {
-            sprintf(st," x(%x)", atoi(v.c_str()));//FIXME
+            st = Util::Format(" x(%x)", atoi(v.c_str()));//FIXME
          }
          else
          {
-            sprintf(st," ");
+            st = Util::Format(" ");
          }
       }
       s << st;
@@ -178,9 +174,17 @@ void gdcmValEntry::Print(std::ostream & os)
 /*
  * \brief   canonical Writer
  */
-void gdcmValEntry::Write(FILE *fp, FileType filetype)
+void ValEntry::Write(FILE* fp, FileType filetype)
 {
-   gdcmDocEntry::Write(fp, filetype);
+   DocEntry::Write(fp, filetype);
+
+   //std::cout << "=====================================" << GetVR() << std::endl;
+      
+   if ( GetGroup() == 0xfffe ) 
+   {
+      return; //delimitors have NO value
+   }
+      
    std::string vr = GetVR();
    int lgr = GetReadLength();
    if (vr == "US" || vr == "SS")
@@ -190,11 +194,11 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       // we split the string and write each value as a short int
       std::vector<std::string> tokens;
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
-      Tokenize (GetValue(), tokens, "\\");
+      Util::Tokenize (GetValue(), tokens, "\\");
       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();
@@ -208,11 +212,11 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
       // along the '\' and write each value as an int:
       std::vector<std::string> tokens;
       tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
-      Tokenize (GetValue(), tokens, "\\");
+      Util::Tokenize (GetValue(), tokens, "\\");
       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();
@@ -232,3 +236,5 @@ void gdcmValEntry::Write(FILE *fp, FileType filetype)
 // Private
 
 //-----------------------------------------------------------------------------
+} // end namespace gdcm
+