X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=d10b222857a8bf2b6c160b1a999d403117d2e990;hb=03acf3c119c6657129b8aeae8cb2205e481a105b;hp=8f9f138208e923c543fe4c33b9db2fb025722db2;hpb=f6204e4795251ff95c653e32e8cdca61d2c19880;p=gdcm.git

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 8f9f1382..d10b2228 100644
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/11/03 18:14:52 $
-  Version:   $Revision: 1.115 $
+  Date:      $Date: 2005/01/07 08:46:18 $
+  Version:   $Revision: 1.162 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,12 +23,19 @@
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
+#include "gdcmTS.h"
+#include "gdcmException.h"
+#include "gdcmDictSet.h"
+#include "gdcmRLEFramesInfo.h"
+#include "gdcmJPEGFragmentsInfo.h"
+#include "gdcmDocEntrySet.h"
+#include "gdcmSQItem.h"
 
 #include <vector>
 #include <iomanip>
 
 // For nthos:
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
    #include <winsock.h>
 #else
    #include <netinet/in.h>
@@ -36,9 +43,12 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
 static const char *TransferSyntaxStrings[] =  {
   // Implicit VR Little Endian
   "1.2.840.10008.1.2",
+  // Implicit VR Big Endian DLX G.E?
+  "1.2.840.113619.5.2",
   // Explicit VR Little Endian
   "1.2.840.10008.1.2.1",
   // Deflated Explicit VR Little Endian
@@ -71,7 +81,7 @@ static const char *TransferSyntaxStrings[] =  {
 
 //-----------------------------------------------------------------------------
 // Refer to Document::CheckSwap()
-const unsigned int Document::HEADER_LENGTH_TO_READ = 256;
+//const unsigned int Document::HEADER_LENGTH_TO_READ = 256;
 
 // Refer to Document::SetMaxSizeLoadEntry()
 const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096
@@ -84,12 +94,13 @@ const unsigned int Document::MAX_SIZE_PRINT_ELEMENT_VALUE = 0x7fffffff;
  * \brief   constructor  
  * @param   filename file to be opened for parsing
  */
-Document::Document( std::string const & filename ) : ElementSet(-1)
+Document::Document( std::string const &filename ) : ElementSet(-1)
 {
    SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE); 
    Filename = filename;
    Initialise();
 
+   Fp = 0;
    if ( !OpenFile() )
    {
       return;
@@ -97,19 +108,19 @@ Document::Document( std::string const & filename ) : ElementSet(-1)
 
    dbg.Verbose(0, "Document::Document: starting parsing of file: ",
                   Filename.c_str());
-   Fp->seekg( 0,  std::ios_base::beg);
+   Fp->seekg( 0,  std::ios::beg);
    
-   Fp->seekg(0,  std::ios_base::end);
+   Fp->seekg(0,  std::ios::end);
    long lgt = Fp->tellg();
            
-   Fp->seekg( 0,  std::ios_base::beg);
+   Fp->seekg( 0,  std::ios::beg);
    CheckSwap();
    long beg = Fp->tellg();
    lgt -= beg;
    
    ParseDES( this, beg, lgt, false); // le Load sera fait a la volee
 
-   Fp->seekg( 0,  std::ios_base::beg);
+   Fp->seekg( 0,  std::ios::beg);
    
    // Load 'non string' values
       
@@ -171,8 +182,6 @@ Document::Document( std::string const & filename ) : ElementSet(-1)
          SetEntryByNumber(rows   , 0x0028, 0x0011);
    }
    // ----------------- End of ACR-LibIDO kludge ------------------ 
-
-   PrintLevel = 1;  // 'Medium' print level by default
 }
 
 /**
@@ -181,9 +190,12 @@ Document::Document( std::string const & filename ) : ElementSet(-1)
  */
 Document::Document() : ElementSet(-1)
 {
+   Fp = 0;
+
    SetMaxSizeLoadEntry(MAX_SIZE_LOAD_ELEMENT_VALUE);
    Initialise();
-   PrintLevel = 1;  // 'Medium' print level by default
+   SwapCode = 0;
+   Filetype = ExplicitVR;
 }
 
 /**
@@ -194,13 +206,8 @@ Document::~Document ()
    RefPubDict = NULL;
    RefShaDict = NULL;
 
-   // Recursive clean up of sequences
-   for (TagDocEntryHT::const_iterator it = TagHT.begin(); 
-                                      it != TagHT.end(); ++it )
-   { 
-      //delete it->second; //temp remove
-   }
-   TagHT.clear();
+   delete RLEInfo;
+   delete JPEGInfo;
 }
 
 //-----------------------------------------------------------------------------
@@ -210,8 +217,9 @@ Document::~Document ()
   * \brief   Prints The Dict Entries of THE public Dicom Dictionary
   * @return
   */  
-void Document::PrintPubDict(std::ostream & os)
+void Document::PrintPubDict(std::ostream &os)
 {
+   RefPubDict->SetPrintLevel(PrintLevel);
    RefPubDict->Print(os);
 }
 
@@ -219,8 +227,9 @@ void Document::PrintPubDict(std::ostream & os)
   * \brief   Prints The Dict Entries of THE shadow Dicom Dictionary
   * @return
   */
-void Document::PrintShaDict(std::ostream & os)
+void Document::PrintShaDict(std::ostream &os)
 {
+   RefShaDict->SetPrintLevel(PrintLevel);
    RefShaDict->Print(os);
 }
 
@@ -229,7 +238,7 @@ void Document::PrintShaDict(std::ostream & os)
 /**
  * \brief   Get the public dictionary used
  */
-Dict* Document::GetPubDict()
+Dict *Document::GetPubDict()
 {
    return RefPubDict;
 }
@@ -237,14 +246,14 @@ Dict* Document::GetPubDict()
 /**
  * \brief   Get the shadow dictionary used
  */
-Dict* Document::GetShaDict()
+Dict *Document::GetShaDict()
 {
    return RefShaDict;
 }
 
 /**
  * \brief   Set the shadow dictionary used
- * \param   dict dictionary to use in shadow
+ * @param   dict dictionary to use in shadow
  */
 bool Document::SetShaDict(Dict *dict)
 {
@@ -254,9 +263,9 @@ bool Document::SetShaDict(Dict *dict)
 
 /**
  * \brief   Set the shadow dictionary used
- * \param   dictName name of the dictionary to use in shadow
+ * @param   dictName name of the dictionary to use in shadow
  */
-bool Document::SetShaDict(DictKey const & dictName)
+bool Document::SetShaDict(DictKey const &dictName)
 {
    RefShaDict = Global::GetDicts()->GetDict(dictName);
    return !RefShaDict;
@@ -288,14 +297,11 @@ bool Document::IsReadable()
    return true;
 }
 
-
 /**
- * \brief   Internal function that checks whether the Transfer Syntax given
- *          as argument is the one present in the current document.
- * @param   syntaxToCheck The transfert syntax we need to check against.
- * @return  True when SyntaxToCheck corresponds to the Transfer Syntax of
- *          the current document. False either when the document contains
- *          no Transfer Syntax, or when the Tranfer Syntaxes doesn't match.
+ * \brief   Accessor to the Transfer Syntax (when present) of the
+ *          current document (it internally handles reading the
+ *          value from disk when only parsing occured).
+ * @return  The encountered Transfer Syntax of the current document.
  */
 TransferSyntaxType Document::GetTransferSyntax()
 {
@@ -308,7 +314,7 @@ TransferSyntaxType Document::GetTransferSyntax()
    // The entry might be present but not loaded (parsing and loading
    // happen at different stages): try loading and proceed with check...
    LoadDocEntrySafe(entry);
-   if (ValEntry* valEntry = dynamic_cast< ValEntry* >(entry) )
+   if (ValEntry *valEntry = dynamic_cast< ValEntry* >(entry) )
    {
       std::string transfer = valEntry->GetValue();
       // The actual transfer (as read from disk) might be padded. We
@@ -319,7 +325,7 @@ TransferSyntaxType Document::GetTransferSyntax()
          // for brain damaged headers
          return UnknownTS;
       }
-      while ( !isdigit(transfer[transfer.length()-1]) )
+      while ( !isdigit((unsigned char)transfer[transfer.length()-1]) )
       {
          transfer.erase(transfer.length()-1, 1);
       }
@@ -409,37 +415,64 @@ FileType Document::GetFileType()
  *         checks the preamble when existing.
  * @return The FILE pointer on success. 
  */
-std::ifstream* Document::OpenFile()
+std::ifstream *Document::OpenFile()
 {
-   Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary);
+   if (Filename.length() == 0) 
+   {
+      return 0;
+   }
 
-   if(!Fp)
+   if(Fp)
+   {
+      dbg.Verbose( 0,
+                   "Document::OpenFile is already opened when opening: ",
+                   Filename.c_str());
+   }
+
+   Fp = new std::ifstream(Filename.c_str(), std::ios::in | std::ios::binary);
+   if( ! *Fp )
    {
       dbg.Verbose( 0,
                    "Document::OpenFile cannot open file: ",
                    Filename.c_str());
+      delete Fp;
+      Fp = 0;
       return 0;
    }
  
    uint16_t zero;
-   Fp->read((char*)&zero,  (size_t)2 );
+   Fp->read((char*)&zero, (size_t)2);
+   if( Fp->eof() )
+   {
+      CloseFile();
+      return 0;
+   }
  
-   //ACR -- or DICOM with no Preamble --
-   if( zero == 0x0008 || zero == 0x0800 || zero == 0x0002 || zero == 0x0200 )
+   //ACR -- or DICOM with no Preamble; may start with a Shadow Group --
+   if( 
+       zero == 0x0001 || zero == 0x0100 || zero == 0x0002 || zero == 0x0200 ||
+       zero == 0x0003 || zero == 0x0300 || zero == 0x0004 || zero == 0x0400 ||
+       zero == 0x0005 || zero == 0x0500 || zero == 0x0006 || zero == 0x0600 ||
+       zero == 0x0007 || zero == 0x0700 || zero == 0x0008 || zero == 0x0800 )
    {
       return Fp;
    }
  
    //DICOM
-   Fp->seekg(126L, std::ios_base::cur);
+   Fp->seekg(126L, std::ios::cur);
    char dicm[4];
    Fp->read(dicm,  (size_t)4);
+   if( Fp->eof() )
+   {
+      CloseFile();
+      return 0;
+   }
    if( memcmp(dicm, "DICM", 4) == 0 )
    {
       return Fp;
    }
  
-   Fp->close();
+   CloseFile();
    dbg.Verbose( 0,
                 "Document::OpenFile not DICOM/ACR (missing preamble)",
                 Filename.c_str());
@@ -453,11 +486,14 @@ std::ifstream* Document::OpenFile()
  */
 bool Document::CloseFile()
 {
-  Fp->close();
-  delete Fp;
-  Fp = 0;
+   if( Fp )
+   {
+      Fp->close();
+      delete Fp;
+      Fp = 0;
+   }
 
-  return true; //FIXME how do we detect a non-close ifstream ?
+   return true; //FIXME how do we detect a non-close ifstream ?
 }
 
 /**
@@ -467,39 +503,22 @@ bool Document::CloseFile()
  *          (ACR-NEMA, ExplicitVR, ImplicitVR)
  * \return Always true.
  */
-void Document::Write(std::ofstream* fp, FileType filetype)
+void Document::WriteContent(std::ofstream *fp, FileType filetype)
 {
    /// \todo move the following lines (and a lot of others, to be written)
    /// to a future function CheckAndCorrectHeader  
    /// (necessary if user wants to write a DICOM V3 file
    /// starting from an  ACR-NEMA (V2)  Header
 
-   if (filetype == ImplicitVR) 
-   {
-      std::string ts = TransferSyntaxStrings[ImplicitVRLittleEndian];
-      ReplaceOrCreateByNumber(ts, 0x0002, 0x0010);
-      
-      /// \todo Refer to standards on page 21, chapter 6.2
-      ///       "Value representation": values with a VR of UI shall be
-      ///       padded with a single trailing null
-      ///       in the following case we have to padd manually with a 0
-      
-      SetEntryLengthByNumber(18, 0x0002, 0x0010);
-   } 
-
-   if (filetype == ExplicitVR)
+   if ( filetype == ImplicitVR || filetype == ExplicitVR )
    {
-      std::string ts = TransferSyntaxStrings[ExplicitVRLittleEndian];
-      ReplaceOrCreateByNumber(ts, 0x0002, 0x0010);
-      
-      /// \todo Refer to standards on page 21, chapter 6.2
-      ///       "Value representation": values with a VR of UI shall be
-      ///       padded with a single trailing null
-      ///       Dans le cas suivant on doit pader manuellement avec un 0
-      
-      SetEntryLengthByNumber(20, 0x0002, 0x0010);
+      // writing Dicom File Preamble
+      char filePreamble[128];
+      memset(filePreamble, 0, 128);
+      fp->write(filePreamble, 128);
+      fp->write("DICM", 4);
    }
-  
+
 /**
  * \todo rewrite later, if really usefull
  *       - 'Group Length' element is optional in DICOM
@@ -512,169 +531,149 @@ void Document::Write(std::ofstream* fp, FileType filetype)
  *    UpdateGroupLength(true,ACR);
  */
  
-   ElementSet::Write(fp, filetype); // This one is recursive
-
+   ElementSet::WriteContent(fp, filetype); // This one is recursive
 }
 
 /**
- * \brief   Modifies the value of a given Header Entry (Dicom Element)
+ * \brief   Modifies the value of a given Doc Entry (Dicom Element)
  *          when it exists. Create it with the given value when unexistant.
  * @param   value (string) Value to be set
  * @param   group   Group number of the Entry 
  * @param   elem  Element number of the Entry
- * @param   VR  V(alue) R(epresentation) of the Entry -if private Entry-
+ * @param   vr  V(alue) R(epresentation) of the Entry -if private Entry-
  * \return  pointer to the modified/created Header Entry (NULL when creation
  *          failed).
  */ 
-ValEntry* Document::ReplaceOrCreateByNumber(
-                                         std::string const & value, 
-                                         uint16_t group, 
-                                         uint16_t elem,
-                                         TagName const & vr )
-{
-   ValEntry* valEntry = 0;
-   DocEntry* currentEntry = GetDocEntryByNumber( group, elem);
+ValEntry *Document::ReplaceOrCreateByNumber(std::string const &value, 
+                                            uint16_t group, 
+                                            uint16_t elem,
+                                            TagName const &vr )
+{
+   ValEntry *valEntry = 0;
+   DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
    
-   if (!currentEntry)
+   if (currentEntry)
    {
-      // check if (group,element) DictEntry exists
-      // if it doesn't, create an entry in DictSet::VirtualEntry
-      // and use it
+      valEntry = dynamic_cast< ValEntry* >(currentEntry);
 
-   // Find out if the tag we received is in the dictionaries:
-      Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
-      DictEntry* dictEntry = pubDict->GetDictEntryByNumber(group, elem);
-      if (!dictEntry)
-      {
-         currentEntry = NewDocEntryByNumber(group, elem, vr);
-      }
-      else
-      {
-         currentEntry = NewDocEntryByNumber(group, elem);
-      }
+      // Verify the VR
+      if( valEntry )
+         if( valEntry->GetVR()!=vr )
+            valEntry=NULL;
 
-      if (!currentEntry)
+      // if currentEntry doesn't correspond to the requested valEntry
+      if( !valEntry)
       {
-         dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to"
-                        " NewDocEntryByNumber failed.");
-         return NULL;
-      }
-      valEntry = new ValEntry(currentEntry);
-      if ( !AddEntry(valEntry))
-      {
-         dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
-                        " failed allthough this is a creation.");
-      }
-   }
-   else
-   {
-      valEntry = dynamic_cast< ValEntry* >(currentEntry);
-      if ( !valEntry ) // Euuuuh? It wasn't a ValEntry
-                       // then we change it to a ValEntry ?
-                       // Shouldn't it be considered as an error ?
-      {
-         // We need to promote the DocEntry to a ValEntry:
-         valEntry = new ValEntry(currentEntry);
          if (!RemoveEntry(currentEntry))
          {
             dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
                            " of previous DocEntry failed.");
-            return NULL;
-         }
-         if ( !AddEntry(valEntry))
-         {
-            dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding"
-                           " promoted ValEntry failed.");
+
             return NULL;
          }
       }
    }
 
-   SetEntryByNumber(value, group, elem);
+   // Create a new valEntry if necessary
+   if (!valEntry)
+   {
+      valEntry = NewValEntryByNumber(group, elem, vr);
 
+      if ( !AddEntry(valEntry))
+      {
+         dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
+                        " failed allthough this is a creation.");
+
+         delete valEntry;
+         return NULL;
+      }
+   }
+
+   // Set the binEntry value
+   SetEntry(value, valEntry);
    return valEntry;
 }   
 
 /*
  * \brief   Modifies the value of a given Header Entry (Dicom Element)
  *          when it exists. Create it with the given value when unexistant.
+ *          A copy of the binArea is made to be kept in the Document.
  * @param   binArea (binary) value to be set
  * @param   Group   Group number of the Entry 
  * @param   Elem  Element number of the Entry
+ * @param   vr  V(alue) R(epresentation) of the Entry -if private Entry-
  * \return  pointer to the modified/created Header Entry (NULL when creation
  *          failed).
  */
-BinEntry* Document::ReplaceOrCreateByNumber(
-                                         uint8_t* binArea,
-                                         int lgth, 
-                                         uint16_t group, 
-                                         uint16_t elem,
-                                         TagName const & vr )
+BinEntry *Document::ReplaceOrCreateByNumber(uint8_t *binArea,
+                                            int lgth, 
+                                            uint16_t group, 
+                                            uint16_t elem,
+                                            TagName const &vr )
 {
-   BinEntry* binEntry = 0;
-   DocEntry* currentEntry = GetDocEntryByNumber( group, elem);
-   if (!currentEntry)
-   {
+   BinEntry *binEntry = 0;
+   DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
 
-      // check if (group,element) DictEntry exists
-      // if it doesn't, create an entry in DictSet::VirtualEntry
-      // and use it
+   // Verify the currentEntry
+   if (currentEntry)
+   {
+      binEntry = dynamic_cast< BinEntry* >(currentEntry);
 
-   // Find out if the tag we received is in the dictionaries:
-      Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
-      DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, elem);
+      // Verify the VR
+      if( binEntry )
+         if( binEntry->GetVR()!=vr )
+            binEntry=NULL;
 
-      if (!dictEntry)
-      {
-         currentEntry = NewDocEntryByNumber(group, elem, vr);
-      }
-      else
+      // if currentEntry doesn't correspond to the requested valEntry
+      if( !binEntry)
       {
-         currentEntry = NewDocEntryByNumber(group, elem);
-      }
-      if (!currentEntry)
-      {
-         dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: call to"
-                        " NewDocEntryByNumber failed.");
-         return NULL;
+         if (!RemoveEntry(currentEntry))
+         {
+            dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
+                           " of previous DocEntry failed.");
+
+            return NULL;
+         }
       }
-      binEntry = new BinEntry(currentEntry);
+   }
+
+   // Create a new binEntry if necessary
+   if (!binEntry)
+   {
+      binEntry = NewBinEntryByNumber(group, elem, vr);
+
       if ( !AddEntry(binEntry))
       {
          dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
                         " failed allthough this is a creation.");
+
+         delete binEntry;
+         return NULL;
       }
    }
+
+   // Set the binEntry value
+   uint8_t *tmpArea;
+   if (lgth>0 && binArea)
+   {
+      tmpArea = new uint8_t[lgth];
+      memcpy(tmpArea,binArea,lgth);
+   }
    else
    {
-      binEntry = dynamic_cast< BinEntry* >(currentEntry);
-      if ( !binEntry ) // Euuuuh? It wasn't a BinEntry
-                       // then we change it to a BinEntry ?
-                       // Shouldn't it be considered as an error ?
+      tmpArea = 0;
+   }
+   if (!SetEntry(tmpArea,lgth,binEntry))
+   {
+      if (tmpArea)
       {
-         // We need to promote the DocEntry to a BinEntry:
-         binEntry = new BinEntry(currentEntry);
-         if (!RemoveEntry(currentEntry))
-         {
-            dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
-                           " of previous DocEntry failed.");
-            return NULL;
-         }
-         if ( !AddEntry(binEntry))
-         {
-            dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: adding"
-                           " promoted BinEntry failed.");
-            return NULL;
-         }
+         delete[] tmpArea;
       }
    }
 
-   SetEntryByNumber(binArea, lgth, group, elem);
-
    return binEntry;
 }  
 
-
 /*
  * \brief   Modifies the value of a given Header Entry (Dicom Element)
  *          when it exists. Create it when unexistant.
@@ -683,22 +682,50 @@ BinEntry* Document::ReplaceOrCreateByNumber(
  * \return  pointer to the modified/created SeqEntry (NULL when creation
  *          failed).
  */
-SeqEntry* Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem)
+SeqEntry *Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem)
 {
-   SeqEntry* b = 0;
-   DocEntry* a = GetDocEntryByNumber( group, elem);
-   if (!a)
+   SeqEntry *seqEntry = 0;
+   DocEntry *currentEntry = GetDocEntryByNumber( group, elem);
+
+   // Verify the currentEntry
+   if (currentEntry)
+   {
+      seqEntry = dynamic_cast< SeqEntry* >(currentEntry);
+
+      // Verify the VR
+      if( seqEntry )
+         if( seqEntry->GetVR()!="SQ" )
+            seqEntry=NULL;
+
+      // if currentEntry doesn't correspond to the requested valEntry
+      if( !seqEntry)
+      {
+         if (!RemoveEntry(currentEntry))
+         {
+            dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: removal"
+                           " of previous DocEntry failed.");
+
+            return NULL;
+         }
+      }
+   }
+
+   // Create a new seqEntry if necessary
+   if (!seqEntry)
    {
-      a = NewSeqEntryByNumber(group, elem);
-      if (!a)
+      seqEntry = NewSeqEntryByNumber(group, elem);
+
+      if ( !AddEntry(seqEntry))
       {
-         return 0;
+         dbg.Verbose(0, "Document::ReplaceOrCreateByNumber: AddEntry"
+                        " failed allthough this is a creation.");
+
+         delete seqEntry;
+         return NULL;
       }
+   }
 
-      b = new SeqEntry(a, 1); // FIXME : 1 (Depth)
-      AddEntry(b);
-   }   
-   return b;
+   return seqEntry;
 } 
  
 /**
@@ -709,7 +736,7 @@ SeqEntry* Document::ReplaceOrCreateByNumber( uint16_t group, uint16_t elem)
  * @param elem element number of the Entry
  * \return  boolean 
  */
-bool Document::ReplaceIfExistByNumber(std::string const & value, 
+bool Document::ReplaceIfExistByNumber(std::string const &value, 
                                       uint16_t group, uint16_t elem ) 
 {
    SetEntryByNumber(value, group, elem);
@@ -717,6 +744,11 @@ bool Document::ReplaceIfExistByNumber(std::string const & value,
    return true;
 } 
 
+std::string Document::GetTransferSyntaxValue(TransferSyntaxType type)
+{
+   return TransferSyntaxStrings[type];
+}
+
 //-----------------------------------------------------------------------------
 // Protected
 
@@ -732,51 +764,6 @@ bool Document::CheckIfEntryExistByNumber(uint16_t group, uint16_t element )
    return TagHT.count(key) != 0;
 }
 
-/**
- * \brief   Searches within Header Entries (Dicom Elements) parsed with 
- *          the public and private dictionaries 
- *          for the element value of a given tag.
- * \warning Don't use any longer : use GetPubEntryByName
- * @param   tagName name of the searched element.
- * @return  Corresponding element value when it exists,
- *          and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
- */
-std::string Document::GetEntryByName(TagName const & tagName)
-{
-   DictEntry* dictEntry = RefPubDict->GetDictEntryByName(tagName); 
-   if( !dictEntry )
-   {
-      return GDCM_UNFOUND;
-   }
-
-   return GetEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
-}
-
-/**
- * \brief   Searches within Header Entries (Dicom Elements) parsed with 
- *          the public and private dictionaries 
- *          for the element value representation of a given tag.
- *
- *          Obtaining the VR (Value Representation) might be needed by caller
- *          to convert the string typed content to caller's native type 
- *          (think of C++ vs Python). The VR is actually of a higher level
- *          of semantics than just the native C++ type.
- * @param   tagName name of the searched element.
- * @return  Corresponding element value representation when it exists,
- *          and the string GDCM_UNFOUND ("gdcm::Unfound") otherwise.
- */
-std::string Document::GetEntryVRByName(TagName const& tagName)
-{
-   DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); 
-   if( dictEntry == NULL)
-   {
-      return GDCM_UNFOUND;
-   }
-
-   DocEntry* elem = GetDocEntryByNumber(dictEntry->GetGroup(),
-                                        dictEntry->GetElement());
-   return elem->GetVR();
-}
 
 /**
  * \brief   Searches within Header Entries (Dicom Elements) parsed with 
@@ -790,7 +777,6 @@ std::string Document::GetEntryVRByName(TagName const& tagName)
 std::string Document::GetEntryByNumber(uint16_t group, uint16_t element)
 {
    TagKey key = DictEntry::TranslateToKey(group, element);
-   /// \todo use map methods, instead of multimap JPR
    if ( !TagHT.count(key))
    {
       return GDCM_UNFOUND;
@@ -815,7 +801,7 @@ std::string Document::GetEntryByNumber(uint16_t group, uint16_t element)
  */
 std::string Document::GetEntryVRByNumber(uint16_t group, uint16_t element)
 {
-   DocEntry* elem = GetDocEntryByNumber(group, element);
+   DocEntry *elem = GetDocEntryByNumber(group, element);
    if ( !elem )
    {
       return GDCM_UNFOUND;
@@ -833,31 +819,13 @@ std::string Document::GetEntryVRByNumber(uint16_t group, uint16_t element)
  */
 int Document::GetEntryLengthByNumber(uint16_t group, uint16_t element)
 {
-   DocEntry* elem =  GetDocEntryByNumber(group, element);
+   DocEntry *elem =  GetDocEntryByNumber(group, element);
    if ( !elem )
    {
       return -2;  //magic number
    }
    return elem->GetLength();
 }
-/**
- * \brief   Sets the value (string) of the Header Entry (Dicom Element)
- * @param   content string value of the Dicom Element
- * @param   tagName name of the searched Dicom Element.
- * @return  true when found
- */
-bool Document::SetEntryByName(std::string const & content,
-                              TagName const & tagName)
-{
-   DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); 
-   if( !dictEntry )
-   {
-      return false;
-   }
-
-   return SetEntryByNumber(content,dictEntry->GetGroup(),
-                                   dictEntry->GetElement());
-}
 
 /**
  * \brief   Accesses an existing DocEntry (i.e. a Dicom Element)
@@ -870,45 +838,14 @@ bool Document::SetEntryByName(std::string const & content,
 bool Document::SetEntryByNumber(std::string const& content, 
                                 uint16_t group, uint16_t element) 
 {
-   int c;
-   int l;
-
-   ValEntry* valEntry = GetValEntryByNumber(group, element);
-   if (!valEntry )
+   ValEntry *entry = GetValEntryByNumber(group, element);
+   if (!entry )
    {
       dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding",
                      " ValEntry (try promotion first).");
       return false;
    }
-   // Non even content must be padded with a space (020H)...
-   std::string finalContent = content;
-   if( finalContent.length() % 2 )
-   {
-      finalContent += '\0';  // ... therefore we padd with (000H) .!?!
-   }      
-   valEntry->SetValue(finalContent);
-   
-   // Integers have a special treatement for their length:
-
-   l = finalContent.length();
-   if ( l != 0) // To avoid to be cheated by 'zero length' integers
-   {   
-      VRKey vr = valEntry->GetVR();
-      if( vr == "US" || vr == "SS" )
-      {
-         // for multivaluated items
-         c = Util::CountSubstring(content, "\\") + 1;
-         l = c*2;
-      }
-      else if( vr == "UL" || vr == "SL" )
-      {
-         // for multivaluated items
-         c = Util::CountSubstring(content, "\\") + 1;
-         l = c*4;;
-      }
-   }
-   valEntry->SetLength(l);
-   return true;
+   return SetEntry(content,entry);
 } 
 
 /**
@@ -923,73 +860,57 @@ bool Document::SetEntryByNumber(std::string const& content,
 bool Document::SetEntryByNumber(uint8_t*content, int lgth, 
                                 uint16_t group, uint16_t element) 
 {
-   (void)lgth;  //not used
-   TagKey key = DictEntry::TranslateToKey(group, element);
-   if ( !TagHT.count(key))
+   BinEntry *entry = GetBinEntryByNumber(group, element);
+   if (!entry )
    {
+      dbg.Verbose(0, "Document::SetEntryByNumber: no corresponding",
+                     " ValEntry (try promotion first).");
       return false;
    }
 
-/* Hope Binary field length is *never* wrong    
-   if(lgth%2) // Non even length are padded with a space (020H).
-   {  
-      lgth++;
-      //content = content + '\0'; // fing a trick to enlarge a binary field?
-   }
-*/      
-   BinEntry* a = (BinEntry *)TagHT[key];           
-   a->SetBinArea(content);  
-   a->SetLength(lgth);
-   a->SetValue(GDCM_BINLOADED);
-
-   return true;
+   return SetEntry(content,lgth,entry);
 } 
 
 /**
  * \brief   Accesses an existing DocEntry (i.e. a Dicom Element)
- *          in the PubDocEntrySet of this instance
- *          through it's (group, element) and modifies it's length with
- *          the given value.
- * \warning Use with extreme caution.
- * @param l new length to substitute with
- * @param group     group number of the Entry to modify
- * @param element element number of the Entry to modify
- * @return  true on success, false otherwise.
+ *          and modifies it's content with the given value.
+ * @param  content new value (string) to substitute with
+ * @param  entry Entry to be modified
  */
-bool Document::SetEntryLengthByNumber(uint32_t l, 
-                                      uint16_t group, uint16_t element) 
+bool Document::SetEntry(std::string const &content,ValEntry *entry)
 {
-   /// \todo use map methods, instead of multimap JPR
-   TagKey key = DictEntry::TranslateToKey(group, element);
-   if ( !TagHT.count(key) )
+   if(entry)
    {
-      return false;
-   }
-   if ( l % 2 )
-   {
-      l++; // length must be even
+      entry->SetValue(content);
+      return true;
    }
-   ( ((TagHT.equal_range(key)).first)->second )->SetLength(l); 
-
-   return true ;
+   return false;
 }
 
 /**
- * \brief   Gets (from Header) the offset  of a 'non string' element value 
- *          (LoadElementValues has already be executed)
- * @param group   group number of the Entry 
- * @param elem  element number of the Entry
- * @return File Offset of the Element Value 
+ * \brief   Accesses an existing BinEntry (i.e. a Dicom Element)
+ *          and modifies it's content with the given value.
+ * @param   content new value (void*  -> uint8_t*) to substitute with
+ * @param  entry Entry to be modified 
+ * @param   lgth new value length
  */
-size_t Document::GetEntryOffsetByNumber(uint16_t group, uint16_t elem) 
+bool Document::SetEntry(uint8_t *content, int lgth, BinEntry *entry)
 {
-   DocEntry* entry = GetDocEntryByNumber(group, elem);
-   if (!entry) 
+   if(entry)
    {
-      dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry present.");
-      return 0;
+      // Hope Binary field length is *never* wrong    
+      /*if(lgth%2) // Non even length are padded with a space (020H).
+      {  
+         lgth++;
+         //content = content + '\0'; // fing a trick to enlarge a binary field?
+      }*/
+      
+      entry->SetBinArea(content);  
+      entry->SetLength(lgth);
+      entry->SetValue(GDCM_BINLOADED);
+      return true;
    }
-   return entry->GetOffset();
+   return false;
 }
 
 /**
@@ -999,15 +920,15 @@ size_t Document::GetEntryOffsetByNumber(uint16_t group, uint16_t elem)
  * @param elem  element number of the Entry
  * @return Pointer to the 'non string' area
  */
-void*  Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem) 
+void *Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem) 
 {
-   DocEntry* entry = GetDocEntryByNumber(group, elem);
+   DocEntry *entry = GetDocEntryByNumber(group, elem);
    if (!entry) 
    {
       dbg.Verbose(1, "Document::GetDocEntryByNumber: no entry");
       return 0;
    }
-   if ( BinEntry* binEntry = dynamic_cast<BinEntry*>(entry) )
+   if ( BinEntry *binEntry = dynamic_cast<BinEntry*>(entry) )
    {
       return binEntry->GetBinArea();
    }
@@ -1021,61 +942,57 @@ void*  Document::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem)
  * @param group   group number of the Entry 
  * @param elem  element number of the Entry
  */
-void* Document::LoadEntryBinArea(uint16_t group, uint16_t elem)
+void Document::LoadEntryBinArea(uint16_t group, uint16_t elem)
 {
+   // Search the corresponding DocEntry
    DocEntry *docElement = GetDocEntryByNumber(group, elem);
    if ( !docElement )
-   {
-      return NULL;
-   }
-   size_t o =(size_t)docElement->GetOffset();
-   Fp->seekg( o, std::ios_base::beg);
-   size_t l = docElement->GetLength();
-   uint8_t* a = new uint8_t[l];
-   if(!a)
-   {
-      dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a");
-      return NULL;
-   }
-   Fp->read((char*)a, l);
-   if( Fp->fail() || Fp->eof() )//Fp->gcount() == 1
-   {
-      delete[] a;
-      return NULL;
-   }
-  /// \todo Drop any already existing void area! JPR
-   if( !SetEntryBinAreaByNumber( a, group, elem ) )
-   {
-      dbg.Verbose(0, "Document::LoadEntryBinArea setting failed.");
-   }
-   return a;
+      return;
+
+   BinEntry *binElement = dynamic_cast<BinEntry *>(docElement);
+   if( !binElement )
+      return;
+
+   LoadEntryBinArea(binElement);
 }
+
 /**
  * \brief         Loads (from disk) the element content 
  *                when a string is not suitable
  * @param element  Entry whose binArea is going to be loaded
  */
-void* Document::LoadEntryBinArea(BinEntry* element) 
+void Document::LoadEntryBinArea(BinEntry *element) 
 {
+   if(element->GetBinArea())
+      return;
+
+   bool openFile = !Fp;
+   if(openFile)
+      OpenFile();
+
    size_t o =(size_t)element->GetOffset();
-   Fp->seekg(o, std::ios_base::beg);
+   Fp->seekg(o, std::ios::beg);
+
    size_t l = element->GetLength();
-   uint8_t* a = new uint8_t[l];
+   uint8_t *a = new uint8_t[l];
    if( !a )
    {
       dbg.Verbose(0, "Document::LoadEntryBinArea cannot allocate a");
-      return NULL;
+      return;
    }
-   element->SetBinArea((uint8_t*)a);
+
    /// \todo check the result 
    Fp->read((char*)a, l);
    if( Fp->fail() || Fp->eof()) //Fp->gcount() == 1
    {
       delete[] a;
-      return NULL;
+      return;
    }
 
-   return a;
+   element->SetBinArea(a);
+
+   if(openFile)
+      CloseFile();
 }
 
 /**
@@ -1085,87 +1002,23 @@ void* Document::LoadEntryBinArea(BinEntry* element)
  * @param   element Element number of the searched Dicom Element 
  * @return  
  */
-bool Document::SetEntryBinAreaByNumber(uint8_t* area,
+/*bool Document::SetEntryBinAreaByNumber(uint8_t *area,
                                        uint16_t group, uint16_t element) 
 {
-   DocEntry* currentEntry = GetDocEntryByNumber(group, element);
+   DocEntry *currentEntry = GetDocEntryByNumber(group, element);
    if ( !currentEntry )
    {
       return false;
    }
-   if ( BinEntry* binEntry = dynamic_cast<BinEntry*>(currentEntry) )
+
+   if ( BinEntry *binEntry = dynamic_cast<BinEntry*>(currentEntry) )
    {
       binEntry->SetBinArea( area );
       return true;
    }
-   return true;
-}
-
-/**
- * \brief   Update the entries with the shadow dictionary. 
- *          Only non even entries are analyzed       
- */
-void Document::UpdateShaEntries()
-{
-   //DictEntry *entry;
-   std::string vr;
-   
-   /// \todo TODO : still any use to explore recursively the whole structure?
-/*
-   for(ListTag::iterator it=listEntries.begin();
-       it!=listEntries.end();
-       ++it)
-   {
-      // Odd group => from public dictionary
-      if((*it)->GetGroup()%2==0)
-         continue;
-
-      // Peer group => search the corresponding dict entry
-      if(RefShaDict)
-         entry=RefShaDict->GetDictEntryByNumber((*it)->GetGroup(),(*it)->GetElement());
-      else
-         entry=NULL;
-
-      if((*it)->IsImplicitVR())
-         vr="Implicit";
-      else
-         vr=(*it)->GetVR();
-
-      (*it)->SetValue(GetDocEntryUnvalue(*it));  // to go on compiling
-      if(entry){
-         // Set the new entry and the new value
-         (*it)->SetDictEntry(entry);
-         CheckDocEntryVR(*it,vr);
-
-         (*it)->SetValue(GetDocEntryValue(*it));    // to go on compiling
- 
-      }
-      else
-      {
-         // Remove precedent value transformation
-         (*it)->SetDictEntry(NewVirtualDictEntry((*it)->GetGroup(),(*it)->GetElement(),vr));
-      }
-   }
-*/   
-}
 
-/**
- * \brief   Searches within the Header Entries for a Dicom Element of
- *          a given tag.
- * @param   tagName name of the searched Dicom Element.
- * @return  Corresponding Dicom Element when it exists, and NULL
- *          otherwise.
- */
-DocEntry* Document::GetDocEntryByName(TagName const & tagName)
-{
-   DictEntry *dictEntry = RefPubDict->GetDictEntryByName(tagName); 
-   if( !dictEntry )
-   {
-      return NULL;
-   }
-
-  return GetDocEntryByNumber(dictEntry->GetGroup(),dictEntry->GetElement());
-}
+   return false;
+}*/
 
 /**
  * \brief  retrieves a Dicom Element (the first one) using (group, element)
@@ -1177,7 +1030,7 @@ DocEntry* Document::GetDocEntryByName(TagName const & tagName)
  * @param   element Element number of the searched Dicom Element 
  * @return  
  */
-DocEntry* Document::GetDocEntryByNumber(uint16_t group, uint16_t element) 
+DocEntry *Document::GetDocEntryByNumber(uint16_t group, uint16_t element) 
 {
    TagKey key = DictEntry::TranslateToKey(group, element);
    if ( !TagHT.count(key))
@@ -1193,34 +1046,59 @@ DocEntry* Document::GetDocEntryByNumber(uint16_t group, uint16_t element)
  *         ValEntry.
  * @return When present, the corresponding ValEntry. 
  */
-ValEntry* Document::GetValEntryByNumber(uint16_t group, uint16_t element)
+ValEntry *Document::GetValEntryByNumber(uint16_t group, uint16_t element)
 {
-   DocEntry* currentEntry = GetDocEntryByNumber(group, element);
+   DocEntry *currentEntry = GetDocEntryByNumber(group, element);
    if ( !currentEntry )
    {
       return 0;
    }
-   if ( ValEntry* valEntry = dynamic_cast<ValEntry*>(currentEntry) )
+   if ( ValEntry *entry = dynamic_cast<ValEntry*>(currentEntry) )
    {
-      return valEntry;
+      return entry;
    }
    dbg.Verbose(0, "Document::GetValEntryByNumber: unfound ValEntry.");
 
    return 0;
 }
 
+/**
+ * \brief  Same as \ref Document::GetDocEntryByNumber except it only
+ *         returns a result when the corresponding entry is of type
+ *         BinEntry.
+ * @return When present, the corresponding BinEntry. 
+ */
+BinEntry *Document::GetBinEntryByNumber(uint16_t group, uint16_t element)
+{
+   DocEntry *currentEntry = GetDocEntryByNumber(group, element);
+   if ( !currentEntry )
+   {
+      return 0;
+   }
+   if ( BinEntry *entry = dynamic_cast<BinEntry*>(currentEntry) )
+   {
+      return entry;
+   }
+   dbg.Verbose(0, "Document::GetBinEntryByNumber: unfound BinEntry.");
+
+   return 0;
+}
+
 /**
  * \brief         Loads the element while preserving the current
- *                underlying file position indicator as opposed to
+ *               underlying file position indicator as opposed to
  *                to LoadDocEntry that modifies it.
  * @param entry   Header Entry whose value shall be loaded. 
  * @return  
  */
-void Document::LoadDocEntrySafe(DocEntry * entry)
+void Document::LoadDocEntrySafe(DocEntry *entry)
 {
-   long PositionOnEntry = Fp->tellg();
-   LoadDocEntry(entry);
-   Fp->seekg(PositionOnEntry, std::ios_base::beg);
+   if(Fp)
+   {
+      long PositionOnEntry = Fp->tellg();
+      LoadDocEntry(entry);
+      Fp->seekg(PositionOnEntry, std::ios::beg);
+   }
 }
 
 /**
@@ -1297,33 +1175,77 @@ void Document::ParseDES(DocEntrySet *set, long offset,
                         long l_max, bool delim_mode)
 {
    DocEntry *newDocEntry = 0;
-   
+   ValEntry *newValEntry;
+   BinEntry *newBinEntry;
+   SeqEntry *newSeqEntry;
+   VRKey vr;
+   bool used=false;
+   long offsetEntry,readEntry;
+
    while (true)
-   { 
-      if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
+   {
+      if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
       {
          break;
       }
+
+      used=true;
       newDocEntry = ReadNextDocEntry( );
       if ( !newDocEntry )
       {
          break;
       }
 
-      VRKey vr = newDocEntry->GetVR();
-      if ( vr != "SQ" )
+      vr = newDocEntry->GetVR();
+      newValEntry = dynamic_cast<ValEntry*>(newDocEntry);
+      newBinEntry = dynamic_cast<BinEntry*>(newDocEntry);
+      newSeqEntry = dynamic_cast<SeqEntry*>(newDocEntry);
+
+      if ( newValEntry || newBinEntry )
       {
+         offsetEntry=newDocEntry->GetOffset();
+         readEntry=newDocEntry->GetReadLength();
                
-         if ( Global::GetVR()->IsVROfGdcmStringRepresentable(vr) )
+         if ( newBinEntry )
+         {
+            if ( ! Global::GetVR()->IsVROfBinaryRepresentable(vr) )
+            { 
+                ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
+                dbg.Verbose(0, "Document::ParseDES: neither Valentry, "
+                               "nor BinEntry. Probably unknown VR.");
+            }
+
+         //////////////////// BinEntry or UNKOWN VR:
+            // When "this" is a Document the Key is simply of the
+            // form ( group, elem )...
+            if (Document *dummy = dynamic_cast< Document* > ( set ) )
+            {
+               (void)dummy;
+               newBinEntry->SetKey( newBinEntry->GetKey() );
+            }
+            // but when "this" is a SQItem, we are inserting this new
+            // valEntry in a sequence item, and the kay has the
+            // generalized form (refer to \ref BaseTagKey):
+            if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) )
+            {
+               newBinEntry->SetKey(  parentSQItem->GetBaseTagKey()
+                                   + newBinEntry->GetKey() );
+            }
+
+            LoadDocEntry( newBinEntry );
+            if( !set->AddEntry( newBinEntry ) )
+            {
+              //Expect big troubles if here
+              //delete newBinEntry;
+              used=false;
+            }
+         }
+         else
          {
          /////////////////////// ValEntry
-            ValEntry* newValEntry =
-               new ValEntry( newDocEntry->GetDictEntry() );
-            newValEntry->Copy( newDocEntry );
-             
             // When "set" is a Document, then we are at the top of the
             // hierarchy and the Key is simply of the form ( group, elem )...
-            if (Document* dummy = dynamic_cast< Document* > ( set ) )
+            if (Document *dummy = dynamic_cast< Document* > ( set ) )
             {
                (void)dummy;
                newValEntry->SetKey( newValEntry->GetKey() );
@@ -1331,55 +1253,33 @@ void Document::ParseDES(DocEntrySet *set, long offset,
             // ...but when "set" is a SQItem, we are inserting this new
             // valEntry in a sequence item. Hence the key has the
             // generalized form (refer to \ref BaseTagKey):
-            if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
+            if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) )
             {
                newValEntry->SetKey(  parentSQItem->GetBaseTagKey()
                                    + newValEntry->GetKey() );
             }
              
-            set->AddEntry( newValEntry );
             LoadDocEntry( newValEntry );
-            if (newValEntry->IsItemDelimitor())
-            {
-               break;
-            }
-            if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
+            bool delimitor=newValEntry->IsItemDelimitor();
+            if( !set->AddEntry( newValEntry ) )
             {
-               break;
-            }
-         }
-         else
-         {
-            if ( ! Global::GetVR()->IsVROfGdcmBinaryRepresentable(vr) )
-            { 
-                ////// Neither ValEntry NOR BinEntry: should mean UNKOWN VR
-                dbg.Verbose(0, "Document::ParseDES: neither Valentry, "
-                               "nor BinEntry. Probably unknown VR.");
+              // If here expect big troubles
+              //delete newValEntry; //otherwise mem leak
+              used=false;
             }
 
-         //////////////////// BinEntry or UNKOWN VR:
-            BinEntry* newBinEntry =
-               new BinEntry( newDocEntry->GetDictEntry() );
-            newBinEntry->Copy( newDocEntry );
-
-            // When "this" is a Document the Key is simply of the
-            // form ( group, elem )...
-            if (Document* dummy = dynamic_cast< Document* > ( set ) )
+            if (delimitor)
             {
-               (void)dummy;
-               newBinEntry->SetKey( newBinEntry->GetKey() );
+               if(!used)
+                  delete newDocEntry;
+               break;
             }
-            // but when "this" is a SQItem, we are inserting this new
-            // valEntry in a sequence item, and the kay has the
-            // generalized form (refer to \ref BaseTagKey):
-            if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
+            if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
             {
-               newBinEntry->SetKey(  parentSQItem->GetBaseTagKey()
-                                   + newBinEntry->GetKey() );
+               if(!used)
+                  delete newDocEntry;
+               break;
             }
-
-            set->AddEntry( newBinEntry );
-            LoadDocEntry( newBinEntry );
          }
 
          if (    ( newDocEntry->GetGroup()   == 0x7fe0 )
@@ -1388,22 +1288,22 @@ void Document::ParseDES(DocEntrySet *set, long offset,
              TransferSyntaxType ts = GetTransferSyntax();
              if ( ts == RLELossless ) 
              {
-                long PositionOnEntry = Fp->tellg();
-                Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg );
+                long positionOnEntry = Fp->tellg();
+                Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
                 ComputeRLEInfo();
-                Fp->seekg( PositionOnEntry, std::ios_base::beg );
+                Fp->seekg( positionOnEntry, std::ios::beg );
              }
              else if ( IsJPEG() )
              {
-                long PositionOnEntry = Fp->tellg();
-                Fp->seekg( newDocEntry->GetOffset(), std::ios_base::beg );
+                long positionOnEntry = Fp->tellg();
+                Fp->seekg( newDocEntry->GetOffset(), std::ios::beg );
                 ComputeJPEGFragmentInfo();
-                Fp->seekg( PositionOnEntry, std::ios_base::beg );
+                Fp->seekg( positionOnEntry, std::ios::beg );
              }
          }
     
          // Just to make sure we are at the beginning of next entry.
-         SkipToNextDocEntry(newDocEntry);
+         SkipToNextDocEntry(offsetEntry,readEntry);
       }
       else
       {
@@ -1421,16 +1321,13 @@ void Document::ParseDES(DocEntrySet *set, long offset,
             }
          }
          // no other way to create it ...
-         SeqEntry* newSeqEntry =
-            new SeqEntry( newDocEntry->GetDictEntry() );
-         newSeqEntry->Copy( newDocEntry );
          newSeqEntry->SetDelimitorMode( delim_mode );
 
          // At the top of the hierarchy, stands a Document. When "set"
          // is a Document, then we are building the first depth level.
          // Hence the SeqEntry we are building simply has a depth
          // level of one:
-         if (Document* dummy = dynamic_cast< Document* > ( set ) )
+         if (Document *dummy = dynamic_cast< Document* > ( set ) )
          {
             (void)dummy;
             newSeqEntry->SetDepthLevel( 1 );
@@ -1439,7 +1336,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
          // But when "set" is allready a SQItem, we are building a nested
          // sequence, and hence the depth level of the new SeqEntry
          // we are building, is one level deeper:
-         if (SQItem* parentSQItem = dynamic_cast< SQItem* > ( set ) )
+         if (SQItem *parentSQItem = dynamic_cast< SQItem* > ( set ) )
          {
             newSeqEntry->SetDepthLevel( parentSQItem->GetDepthLevel() + 1 );
             newSeqEntry->SetKey(  parentSQItem->GetBaseTagKey()
@@ -1453,12 +1350,14 @@ void Document::ParseDES(DocEntrySet *set, long offset,
                      l, delim_mode);
          }
          set->AddEntry( newSeqEntry );
-         if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
+         if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
          {
             break;
          }
       }
-      delete newDocEntry;
+
+      if(!used)
+         delete newDocEntry;
    }
 }
 
@@ -1466,7 +1365,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
  * \brief   Parses a Sequence ( SeqEntry after SeqEntry)
  * @return  parsed length for this level
  */ 
-void Document::ParseSQ( SeqEntry* seqEntry,
+void Document::ParseSQ( SeqEntry *seqEntry,
                         long offset, long l_max, bool delim_mode)
 {
    int SQItemNumber = 0;
@@ -1474,7 +1373,7 @@ void Document::ParseSQ( SeqEntry* seqEntry,
 
    while (true)
    {
-      DocEntry* newDocEntry = ReadNextDocEntry();   
+      DocEntry *newDocEntry = ReadNextDocEntry();   
       if ( !newDocEntry )
       {
          // FIXME Should warn user
@@ -1484,13 +1383,14 @@ void Document::ParseSQ( SeqEntry* seqEntry,
       {
          if ( newDocEntry->IsSequenceDelimitor() )
          {
-            seqEntry->SetSequenceDelimitationItem( newDocEntry );
+            seqEntry->SetSequenceDelimitationItem( newDocEntry ); 
             break;
          }
       }
-      if ( !delim_mode && (Fp->tellg()-offset) >= l_max)
+      if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max)
       {
-          break;
+         delete newDocEntry;
+         break;
       }
 
       SQItem *itemSQ = new SQItem( seqEntry->GetDepthLevel() );
@@ -1512,10 +1412,11 @@ void Document::ParseSQ( SeqEntry* seqEntry,
       }
    
       ParseDES(itemSQ, newDocEntry->GetOffset(), l, dlm_mod);
+      delete newDocEntry;
       
       seqEntry->AddEntry( itemSQ, SQItemNumber ); 
       SQItemNumber++;
-      if ( !delim_mode && ( Fp->tellg() - offset ) >= l_max )
+      if ( !delim_mode && ((long)(Fp->tellg())-offset ) >= l_max )
       {
          break;
       }
@@ -1527,13 +1428,13 @@ void Document::ParseSQ( SeqEntry* seqEntry,
  *                the value specified with Document::SetMaxSizeLoadEntry()
  * @param         entry Header Entry (Dicom Element) to be dealt with
  */
-void Document::LoadDocEntry(DocEntry* entry)
+void Document::LoadDocEntry(DocEntry *entry)
 {
    uint16_t group  = entry->GetGroup();
    std::string  vr = entry->GetVR();
    uint32_t length = entry->GetLength();
 
-   Fp->seekg((long)entry->GetOffset(), std::ios_base::beg);
+   Fp->seekg((long)entry->GetOffset(), std::ios::beg);
 
    // A SeQuence "contains" a set of Elements.  
    //          (fffe e000) tells us an Element is beginning
@@ -1559,7 +1460,7 @@ void Document::LoadDocEntry(DocEntry* entry)
    std::ostringstream s;
    if (length > MaxSizeLoadEntry)
    {
-      if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) )
+      if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) )
       {  
          //s << "gdcm::NotLoaded (BinEntry)";
          s << GDCM_NOTLOADED;
@@ -1568,8 +1469,8 @@ void Document::LoadDocEntry(DocEntry* entry)
          s << " x(" << std::hex << entry->GetLength() << ")";
          binEntryPtr->SetValue(s.str());
       }
-       // Be carefull : a BinEntry IS_A ValEntry ... 
-      else if (ValEntry* valEntryPtr = dynamic_cast< ValEntry* >(entry) )
+      // Be carefull : a BinEntry IS_A ValEntry ... 
+      else if (ValEntry *valEntryPtr = dynamic_cast< ValEntry* >(entry) )
       {
         // s << "gdcm::NotLoaded. (ValEntry)";
          s << GDCM_NOTLOADED;  
@@ -1586,12 +1487,13 @@ void Document::LoadDocEntry(DocEntry* entry)
       }
 
       // to be sure we are at the end of the value ...
-      Fp->seekg((long)entry->GetOffset()+(long)entry->GetLength(),std::ios_base::beg);
+      Fp->seekg((long)entry->GetOffset()+(long)entry->GetLength(),
+                std::ios::beg);
       return;
    }
 
    // When we find a BinEntry not very much can be done :
-   if (BinEntry* binEntryPtr = dynamic_cast< BinEntry* >(entry) )
+   if (BinEntry *binEntryPtr = dynamic_cast< BinEntry* >(entry) )
    {
       s << GDCM_BINLOADED;
       binEntryPtr->SetValue(s.str());
@@ -1648,15 +1550,28 @@ void Document::LoadDocEntry(DocEntry* entry)
       return;
    }
    
-   // We need an additional byte for storing \0 that is not on disk
+  // FIXME: We need an additional byte for storing \0 that is not on disk
    char *str = new char[length+1];
    Fp->read(str, (size_t)length);
-   str[length] = '\0';
-   std::string newValue = str;
+   str[length] = '\0'; //this is only useful when length is odd
+   // Special DicomString call to properly handle \0 and even length
+   std::string newValue;
+   if( length % 2 )
+   {
+      newValue = Util::DicomString(str, length+1);
+      //dbg.Verbose(0, "Warning: bad length: ", length );
+      dbg.Verbose(0, "For string :",  newValue.c_str()); 
+      // Since we change the length of string update it length
+      entry->SetReadLength(length+1);
+   }
+   else
+   {
+      newValue = Util::DicomString(str, length);
+   }
    delete[] str;
 
-   if ( ValEntry* valEntry = dynamic_cast<ValEntry* >(entry) )
-   {  
+   if ( ValEntry *valEntry = dynamic_cast<ValEntry* >(entry) )
+   {
       if ( Fp->fail() || Fp->eof())//Fp->gcount() == 1
       {
          dbg.Verbose(1, "Document::LoadDocEntry",
@@ -1701,7 +1616,7 @@ void Document::FindDocEntryLength( DocEntry *entry )
          // The following reserved two bytes (see PS 3.5-2003, section
          // "7.1.2 Data element structure with explicit vr", p 27) must be
          // skipped before proceeding on reading the length on 4 bytes.
-         Fp->seekg( 2L, std::ios_base::cur);
+         Fp->seekg( 2L, std::ios::cur);
          uint32_t length32 = ReadInt32();
 
          if ( (vr == "OB" || vr == "OW") && length32 == 0xffffffff ) 
@@ -1721,9 +1636,9 @@ void Document::FindDocEntryLength( DocEntry *entry )
                // until the end of the file. Hence we artificially fix the
                // the length and proceed.
                long currentPosition = Fp->tellg();
-               Fp->seekg(0L,std::ios_base::end);
-               long lengthUntilEOF = Fp->tellg() - currentPosition;
-               Fp->seekg(currentPosition, std::ios_base::beg);
+               Fp->seekg(0L,std::ios::end);
+               long lengthUntilEOF = (long)(Fp->tellg())-currentPosition;
+               Fp->seekg(currentPosition, std::ios::beg);
                entry->SetLength(lengthUntilEOF);
                return;
             }
@@ -1779,7 +1694,7 @@ void Document::FindDocEntryLength( DocEntry *entry )
          // and the dictionary entry depending on them.
          uint16_t correctGroup = SwapShort( entry->GetGroup() );
          uint16_t correctElem  = SwapShort( entry->GetElement() );
-         DictEntry* newTag = GetDictEntryByNumber( correctGroup,
+         DictEntry *newTag = GetDictEntryByNumber( correctGroup,
                                                        correctElem );
          if ( !newTag )
          {
@@ -1816,16 +1731,12 @@ void Document::FindDocEntryLength( DocEntry *entry )
 
 /**
  * \brief     Find the Value Representation of the current Dicom Element.
- * @param     entry
+ * @return    Value Representation of the current Entry
  */
-void Document::FindDocEntryVR( DocEntry *entry )
+std::string Document::FindDocEntryVR()
 {
    if ( Filetype != ExplicitVR )
-   {
-      return;
-   }
-
-   char vr[3];
+      return(GDCM_UNKNOWN);
 
    long positionOnEntry = Fp->tellg();
    // Warning: we believe this is explicit VR (Value Representation) because
@@ -1835,105 +1746,34 @@ void Document::FindDocEntryVR( DocEntry *entry )
    // within an explicit VR file. Hence we make sure the present tag
    // is in explicit VR and try to fix things if it happens not to be
    // the case.
-   
+
+   char vr[3];
    Fp->read (vr, (size_t)2);
    vr[2] = 0;
 
-   if( !CheckDocEntryVR(entry, vr) )
+   if( !CheckDocEntryVR(vr) )
    {
-      Fp->seekg(positionOnEntry, std::ios_base::beg);
-      // When this element is known in the dictionary we shall use, e.g. for
-      // the semantics (see the usage of IsAnInteger), the VR proposed by the
-      // dictionary entry. Still we have to flag the element as implicit since
-      // we know now our assumption on expliciteness is not furfilled.
-      // avoid  .
-      if ( entry->IsVRUnknown() )
-      {
-         entry->SetVR("Implicit");
-      }
-      entry->SetImplicitVR();
+      Fp->seekg(positionOnEntry, std::ios::beg);
+      return(GDCM_UNKNOWN);
    }
+   return(vr);
 }
 
 /**
  * \brief     Check the correspondance between the VR of the header entry
  *            and the taken VR. If they are different, the header entry is 
  *            updated with the new VR.
- * @param     entry Header Entry to check
  * @param     vr    Dicom Value Representation
  * @return    false if the VR is incorrect of if the VR isn't referenced
  *            otherwise, it returns true
 */
-bool Document::CheckDocEntryVR(DocEntry *entry, VRKey vr)
+bool Document::CheckDocEntryVR(VRKey vr)
 {
-   std::string msg;
-   bool realExplicit = true;
-
-   // Assume we are reading a falsely explicit VR file i.e. we reached
-   // a tag where we expect reading a VR but are in fact we read the
-   // first to bytes of the length. Then we will interogate (through find)
-   // the dicom_vr dictionary with oddities like "\004\0" which crashes
-   // both GCC and VC++ implementations of the STL map. Hence when the
-   // expected VR read happens to be non-ascii characters we consider
-   // we hit falsely explicit VR tag.
-
-   if ( !isalpha(vr[0]) && !isalpha(vr[1]) )
-   {
-      realExplicit = false;
-   }
-
    // CLEANME searching the dicom_vr at each occurence is expensive.
    // PostPone this test in an optional integrity check at the end
    // of parsing or only in debug mode.
-   if ( realExplicit && !Global::GetVR()->Count(vr) )
-   {
-      realExplicit = false;
-   }
-
-   if ( !realExplicit ) 
-   {
-      // We thought this was explicit VR, but we end up with an
-      // implicit VR tag. Let's backtrack.   
-      msg = Util::Format("Falsely explicit vr file (%04x,%04x)\n", 
-                    entry->GetGroup(), entry->GetElement());
-      dbg.Verbose(1, "Document::FindVR: ", msg.c_str());
-
-      if( entry->GetGroup() % 2 && entry->GetElement() == 0x0000)
-      {
-         // Group length is UL !
-         DictEntry* newEntry = NewVirtualDictEntry(
-                                   entry->GetGroup(), entry->GetElement(),
-                                   "UL", "FIXME", "Group Length");
-         entry->SetDictEntry( newEntry );
-      }
+   if ( !Global::GetVR()->IsValidVR(vr) )
       return false;
-   }
-
-   if ( entry->IsVRUnknown() )
-   {
-      // When not a dictionary entry, we can safely overwrite the VR.
-      if( entry->GetElement() == 0x0000 )
-      {
-         // Group length is UL !
-         entry->SetVR("UL");
-      }
-      else
-      {
-         entry->SetVR(vr);
-      }
-   }
-   else if ( entry->GetVR() != vr ) 
-   {
-      // The VR present in the file and the dictionary disagree. We assume
-      // the file writer knew best and use the VR of the file. Since it would
-      // be unwise to overwrite the VR of a dictionary (since it would
-      // compromise it's next user), we need to clone the actual DictEntry
-      // and change the VR for the read one.
-      DictEntry* newEntry = NewVirtualDictEntry(
-                                entry->GetGroup(), entry->GetElement(),
-                                vr, "FIXME", entry->GetName());
-      entry->SetDictEntry(newEntry);
-   }
 
    return true; 
 }
@@ -2021,7 +1861,7 @@ std::string Document::GetDocEntryValue(DocEntry *entry)
  * @param   entry Entry to reverse transform
  * @return  Reverse transformed entry value
  */
-std::string Document::GetDocEntryUnvalue(DocEntry* entry)
+std::string Document::GetDocEntryUnvalue(DocEntry *entry)
 {
    if ( IsDocEntryAnInteger(entry) && entry->IsImplicitVR() )
    {
@@ -2082,12 +1922,14 @@ void Document::SkipDocEntry(DocEntry *entry)
 /**
  * \brief   Skips to the begining of the next Header Entry 
  * \warning NOT end user intended method !
- * @param   entry entry to skip
+ * @param   offset start of skipping
+ * @param   readLgth length to skip
+
  */
-void Document::SkipToNextDocEntry(DocEntry *entry) 
+void Document::SkipToNextDocEntry(long offset,long readLgth) 
 {
-   Fp->seekg((long)(entry->GetOffset()),     std::ios_base::beg);
-   Fp->seekg( (long)(entry->GetReadLength()), std::ios_base::cur);
+   Fp->seekg((long)(offset),    std::ios::beg);
+   Fp->seekg( (long)(readLgth), std::ios::cur);
 }
 
 /**
@@ -2180,7 +2022,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry)
 {
    uint16_t element = entry->GetElement();
    uint16_t group   = entry->GetGroup();
-   std::string  vr  = entry->GetVR();
+   const std::string &vr  = entry->GetVR();
    uint32_t length  = entry->GetLength();
 
    // When we have some semantics on the element we just read, and if we
@@ -2214,8 +2056,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry)
    if ( vr == "UL" || vr == "US" || vr == "SL" || vr == "SS" )
    {
       return true;
-   }
-   
+   }   
    return false;
 }
 
@@ -2255,7 +2096,7 @@ uint32_t Document::FindDocEntryLengthOB()
       {
          dbg.Verbose(1, "Document::FindDocEntryLengthOB: neither an Item "
                         "tag nor a Sequence delimiter tag."); 
-         Fp->seekg(positionOnEntry, std::ios_base::beg);
+         Fp->seekg(positionOnEntry, std::ios::beg);
          throw FormatUnexpected("Document::FindDocEntryLengthOB()",
                                 "Neither an Item tag nor a Sequence "
                                 "delimiter tag.");
@@ -2276,7 +2117,7 @@ uint32_t Document::FindDocEntryLengthOB()
          break;
       }
    }
-   Fp->seekg( positionOnEntry, std::ios_base::beg);
+   Fp->seekg( positionOnEntry, std::ios::beg);
    return totalLength;
 }
 
@@ -2292,7 +2133,7 @@ uint16_t Document::ReadInt16()
    Fp->read ((char*)&g, (size_t)2);
    if ( Fp->fail() )
    {
-          throw FormatError( "Document::ReadInt16()", " file error." );
+      throw FormatError( "Document::ReadInt16()", " file error." );
    }
    if( Fp->eof() )
    {
@@ -2332,7 +2173,7 @@ uint32_t Document::ReadInt32()
 void Document::SkipBytes(uint32_t nBytes)
 {
    //FIXME don't dump the returned value
-   Fp->seekg((long)nBytes, std::ios_base::cur);
+   Fp->seekg((long)nBytes, std::ios::cur);
 }
 
 /**
@@ -2345,6 +2186,7 @@ void Document::Initialise()
    RefShaDict = NULL;
    RLEInfo  = new RLEFramesInfo;
    JPEGInfo = new JPEGFragmentsInfo;
+   Filetype = Unknown;
 }
 
 /**
@@ -2367,7 +2209,7 @@ bool Document::CheckSwap()
    uint32_t  s32;
    uint16_t  s16;
        
-   char deb[HEADER_LENGTH_TO_READ];
+   char deb[256];
     
    // First, compare HostByteOrder and NetworkByteOrder in order to
    // determine if we shall need to swap bytes (i.e. the Endian type).
@@ -2382,7 +2224,7 @@ bool Document::CheckSwap()
          
    // The easiest case is the one of a DICOM header, since it possesses a
    // file preamble where it suffice to look for the string "DICM".
-   Fp->read(deb, HEADER_LENGTH_TO_READ);
+   Fp->read(deb, 256);
    
    char *entCur = deb + 128;
    if( memcmp(entCur, "DICM", (size_t)4) == 0 )
@@ -2446,8 +2288,8 @@ bool Document::CheckSwap()
       
       // Position the file position indicator at first tag (i.e.
       // after the file preamble and the "DICM" string).
-      Fp->seekg(0, std::ios_base::beg);
-      Fp->seekg ( 132L, std::ios_base::beg);
+      Fp->seekg(0, std::ios::beg);
+      Fp->seekg ( 132L, std::ios::beg);
       return true;
    } // End of DicomV3
 
@@ -2455,7 +2297,7 @@ bool Document::CheckSwap()
    // preamble. We can reset the file position indicator to where the data
    // is (i.e. the beginning of the file).
    dbg.Verbose(1, "Document::CheckSwap:", "not a DICOM Version3 file");
-   Fp->seekg(0, std::ios_base::beg);
+   Fp->seekg(0, std::ios::beg);
 
    // Our next best chance would be to be considering a 'clean' ACR/NEMA file.
    // By clean we mean that the length of the first tag is written down.
@@ -2467,7 +2309,7 @@ bool Document::CheckSwap()
    // representation of a 32 bits integer. Hence the following dirty
    // trick :
    s32 = *((uint32_t *)(entCur));
-      
+
    switch( s32 )
    {
       case 0x00040000 :
@@ -2492,13 +2334,13 @@ bool Document::CheckSwap()
          // So, let's check if this file wouldn't happen to be 'dirty' ACR/NEMA,
          //  i.e. the 'group length' element is not present :     
          
-         //  check the supposed to be 'group number'
-         //  0x0002 or 0x0004 or 0x0008
+         //  check the supposed-to-be 'group number'
+         //  in ( 0x0001 .. 0x0008 )
          //  to determine ' SwapCode' value .
          //  Only 0 or 4321 will be possible 
          //  (no oportunity to check for the formerly well known
          //  ACR-NEMA 'Bad Big Endian' or 'Bad Little Endian' 
-         //  if unsuccessfull (i.e. neither 0x0002 nor 0x0200 etc -4, 8-) 
+         //  if unsuccessfull (i.e. neither 0x0002 nor 0x0200 etc -3, 4, ..., 8-) 
          //  the file IS NOT ACR-NEMA nor DICOM V3
          //  Find a trick to tell it the caller...
       
@@ -2506,22 +2348,32 @@ bool Document::CheckSwap()
       
          switch ( s16 )
          {
+            case 0x0001 :
             case 0x0002 :
+            case 0x0003 :
             case 0x0004 :
-            case 0x0008 :      
+            case 0x0005 :
+            case 0x0006 :
+            case 0x0007 :
+            case 0x0008 :
                SwapCode = 0;
                Filetype = ACR;
                return true;
+            case 0x0100 :
             case 0x0200 :
+            case 0x0300 :
             case 0x0400 :
-            case 0x0800 : 
+            case 0x0500 :
+            case 0x0600 :
+            case 0x0700 :
+            case 0x0800 :
                SwapCode = 4321;
                Filetype = ACR;
                return true;
             default :
                dbg.Verbose(0, "Document::CheckSwap:",
-                     "ACR/NEMA unfound swap info (Really hopeless !)"); 
-               Filetype = Unknown;     
+                     "ACR/NEMA unfound swap info (Really hopeless !)");
+               Filetype = Unknown;
                return false;
          }
          // Then the only info we have is the net2host one.
@@ -2533,6 +2385,8 @@ bool Document::CheckSwap()
    }
 }
 
+
+
 /**
  * \brief Restore the unproperly loaded values i.e. the group, the element
  *        and the dictionary entry depending on them. 
@@ -2600,6 +2454,34 @@ void Document::SetMaxSizePrintEntry(long newSize)
 
 
 
+/**
+ * \brief   Handle broken private tag from Philips NTSCAN
+ *          where the endianess is being switch to BigEndian for no
+ *          apparent reason
+ * @return  no return
+ */
+void Document::HandleBrokenEndian(uint16_t group, uint16_t elem)
+{
+   // Endian reversion. Some files contain groups of tags with reversed endianess.
+   static int reversedEndian = 0;
+   // try to fix endian switching in the middle of headers
+   if ((group == 0xfeff) && (elem == 0x00e0))
+   {
+     // start endian swap mark for group found
+     reversedEndian++;
+     SwitchSwapToBigEndian();
+     // fix the tag
+     group = 0xfffe;
+     elem = 0xe000;
+   } 
+   else if ((group == 0xfffe) && (elem == 0xe00d) && reversedEndian) 
+   {
+     // end of reversed endian group
+     reversedEndian--;
+     SwitchSwapToBigEndian();
+   }
+}
+
 /**
  * \brief   Read the next tag but WITHOUT loading it's value
  *          (read the 'Group Number', the 'Element Number',
@@ -2607,7 +2489,7 @@ void Document::SetMaxSizePrintEntry(long newSize)
  *          gets the VR, gets the length, gets the offset value)
  * @return  On succes the newly created DocEntry, NULL on failure.      
  */
-DocEntry* Document::ReadNextDocEntry()
+DocEntry *Document::ReadNextDocEntry()
 {
    uint16_t group;
    uint16_t elem;
@@ -2625,8 +2507,38 @@ DocEntry* Document::ReadNextDocEntry()
       return 0;
    }
 
-   DocEntry *newEntry = NewDocEntryByNumber(group, elem);
-   FindDocEntryVR(newEntry);
+   HandleBrokenEndian(group, elem);
+   std::string vr = FindDocEntryVR();
+   std::string realVR = vr;
+
+   if( vr == GDCM_UNKNOWN)
+   {
+      DictEntry *dictEntry = GetDictEntryByNumber(group,elem);
+      if( dictEntry )
+         realVR = dictEntry->GetVR();
+   }
+
+   DocEntry *newEntry;
+   if( Global::GetVR()->IsVROfSequence(realVR) )
+      newEntry = NewSeqEntryByNumber(group, elem);
+   else if( Global::GetVR()->IsVROfStringRepresentable(realVR) )
+      newEntry = NewValEntryByNumber(group, elem,vr);
+   else
+      newEntry = NewBinEntryByNumber(group, elem,vr);
+
+   if( vr == GDCM_UNKNOWN )
+   {
+      if( Filetype == ExplicitVR )
+      {
+         // We thought this was explicit VR, but we end up with an
+         // implicit VR tag. Let's backtrack.   
+         std::string msg;
+         msg = Util::Format("Falsely explicit vr file (%04x,%04x)\n", 
+                       newEntry->GetGroup(), newEntry->GetElement());
+         dbg.Verbose(1, "Document::FindVR: ", msg.c_str());
+      }
+      newEntry->SetImplicitVR();
+   }
 
    try
    {
@@ -2685,8 +2597,18 @@ bool Document::ReadTag(uint16_t testGroup, uint16_t testElement)
 
    //// Read the Item Tag group and element, and make
    // sure they are what we expected:
-   uint16_t itemTagGroup   = ReadInt16();
-   uint16_t itemTagElement = ReadInt16();
+   uint16_t itemTagGroup;
+   uint16_t itemTagElement;
+   try
+   {
+      itemTagGroup   = ReadInt16();
+      itemTagElement = ReadInt16();
+   }
+   catch ( FormatError e )
+   {
+      //std::cerr << e << std::endl;
+      return false;
+   }
    if ( itemTagGroup != testGroup || itemTagElement != testElement )
    {
       std::ostringstream s;
@@ -2698,7 +2620,7 @@ bool Document::ReadTag(uint16_t testGroup, uint16_t testElement)
       s << "  at address: " << (unsigned)currentPosition << std::endl;
       dbg.Verbose(0, "Document::ReadItemTagLength: wrong Item Tag found:");
       dbg.Verbose(0, s.str().c_str());
-      Fp->seekg(positionOnEntry, std::ios_base::beg);
+      Fp->seekg(positionOnEntry, std::ios::beg);
 
       return false;
    }
@@ -2759,7 +2681,7 @@ void Document::ReadAndSkipEncapsulatedBasicOffsetTable()
    //          lengths, but we won't bother with such fuses for the time being.
    if ( itemLength != 0 )
    {
-      char* basicOffsetTableItemValue = new char[itemLength + 1];
+      char *basicOffsetTableItemValue = new char[itemLength + 1];
       Fp->read(basicOffsetTableItemValue, itemLength);
 
 #ifdef GDCM_DEBUG
@@ -2832,7 +2754,7 @@ void Document::ComputeRLEInfo()
          dbg.Verbose(0, "Document::ComputeRLEInfo: too many segments.");
       }
  
-      uint32_t rleSegmentOffsetTable[15];
+      uint32_t rleSegmentOffsetTable[16];
       for( int k = 1; k <= 15; k++ )
       {
          rleSegmentOffsetTable[k] = ReadInt32();
@@ -2858,7 +2780,7 @@ void Document::ComputeRLEInfo()
        SkipBytes(rleSegmentLength[nbRleSegments]);
 
        // Store the collected info
-       RLEFrame* newFrameInfo = new RLEFrame;
+       RLEFrame *newFrameInfo = new RLEFrame;
        newFrameInfo->NumberFragments = nbRleSegments;
        for( unsigned int uk = 1; uk <= nbRleSegments; uk++ )
        {
@@ -2901,7 +2823,7 @@ void Document::ComputeJPEGFragmentInfo()
       long fragmentOffset = Fp->tellg();
 
        // Store the collected info
-       JPEGFragment* newFragment = new JPEGFragment;
+       JPEGFragment *newFragment = new JPEGFragment;
        newFragment->Offset = fragmentOffset;
        newFragment->Length = fragmentLength;
        JPEGInfo->Fragments.push_back( newFragment );
@@ -2927,18 +2849,18 @@ void Document::ComputeJPEGFragmentInfo()
  *        when recursively walking the given set.
  * @param set The structure to be traversed (recursively).
  */
-void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
-                                          DocEntrySet* set )
+void Document::BuildFlatHashTableRecurse( TagDocEntryHT &builtHT,
+                                          DocEntrySet *set )
 { 
-   if (ElementSet* elementSet = dynamic_cast< ElementSet* > ( set ) )
+   if (ElementSet *elementSet = dynamic_cast< ElementSet* > ( set ) )
    {
-      TagDocEntryHT const & currentHT = elementSet->GetTagHT();
+      TagDocEntryHT const &currentHT = elementSet->GetTagHT();
       for( TagDocEntryHT::const_iterator i  = currentHT.begin();
                                          i != currentHT.end();
                                        ++i)
       {
-         DocEntry* entry = i->second;
-         if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+         DocEntry *entry = i->second;
+         if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(entry) )
          {
             const ListSQItem& items = seqEntry->GetSQItems();
             for( ListSQItem::const_iterator item  = items.begin();
@@ -2954,15 +2876,15 @@ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
       return;
     }
 
-   if (SQItem* SQItemSet = dynamic_cast< SQItem* > ( set ) )
+   if (SQItem *SQItemSet = dynamic_cast< SQItem* > ( set ) )
    {
       const ListDocEntry& currentList = SQItemSet->GetDocEntries();
       for (ListDocEntry::const_iterator i  = currentList.begin();
                                         i != currentList.end();
                                       ++i)
       {
-         DocEntry* entry = *i;
-         if ( SeqEntry* seqEntry = dynamic_cast<SeqEntry*>(entry) )
+         DocEntry *entry = *i;
+         if ( SeqEntry *seqEntry = dynamic_cast<SeqEntry*>(entry) )
          {
             const ListSQItem& items = seqEntry->GetSQItems();
             for( ListSQItem::const_iterator item  = items.begin();
@@ -2984,7 +2906,7 @@ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
  *        Document.
  *
  *        The structure used by a Document (through \ref ElementSet),
- *        in order to old the parsed entries of a Dicom header, is a recursive
+ *        in order to hold the parsed entries of a Dicom header, is a recursive
  *        one. This is due to the fact that the sequences (when present)
  *        can be nested. Additionaly, the sequence items (represented in
  *        gdcm as \ref SQItem) add an extra complexity to the data
@@ -3002,9 +2924,9 @@ void Document::BuildFlatHashTableRecurse( TagDocEntryHT& builtHT,
  *        \ref BuildFlatHashTable again...
  * @return The flat std::map<> we juste build.
  */
-TagDocEntryHT* Document::BuildFlatHashTable()
+TagDocEntryHT *Document::BuildFlatHashTable()
 {
-   TagDocEntryHT* FlatHT = new TagDocEntryHT;
+   TagDocEntryHT *FlatHT = new TagDocEntryHT;
    BuildFlatHashTableRecurse( *FlatHT, this );
    return FlatHT;
 }
@@ -3076,6 +2998,52 @@ bool Document::operator<(Document &document)
    return false;
 }
 
+
+/**
+ * \brief   Re-computes the length of a ACR-NEMA/Dicom group from a DcmHeader
+ * @param filetype Type of the File to be written 
+ */
+int Document::ComputeGroup0002Length( FileType filetype ) 
+{
+   uint16_t gr, el;
+   std::string vr;
+   
+   int groupLength = 0;
+   bool found0002 = false;   
+  
+   // for each zero-level Tag in the DCM Header
+   DocEntry *entry;
+
+   Initialize();
+   entry = GetNextEntry();
+   while(entry)
+   {
+      gr = entry->GetGroup();
+
+      if (gr == 0x0002)
+      {
+         found0002 = true;
+
+         el = entry->GetElement();
+         vr = entry->GetVR();            
+ 
+         if (filetype == ExplicitVR) 
+         {
+            if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") ) 
+            {
+               groupLength +=  4; // explicit VR AND OB, OW, SQ : 4 more bytes
+            }
+         }
+         groupLength += 2 + 2 + 4 + entry->GetLength();   
+      }
+      else if (found0002 )
+         break;
+
+      entry = GetNextEntry();
+   }
+   return groupLength; 
+}
+
 } // end namespace gdcm
 
 //-----------------------------------------------------------------------------