X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocument.cxx;h=00aa5148e431995324fa6df3fe104ec382a13792;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=3c63f3e8feeb819a03738c2a62cd966a81690243;hpb=04530e8606acf3f15a9d1f85e3c804941b6554a6;p=gdcm.git

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 3c63f3e8..00aa5148 100644
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/08/21 12:51:09 $
-  Version:   $Revision: 1.367 $
+  Date:      $Date: 2007/09/19 06:42:08 $
+  Version:   $Revision: 1.371 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,7 +50,7 @@ const unsigned int Document::MAX_SIZE_LOAD_ELEMENT_VALUE = 0xfff; // 4096
 
 /**
  * \brief This default constructor neither loads nor parses the file. 
- *        You should then invoke \ref Document::Load.
+ *        You should then invoke Document::Load.
  *         
  */
 Document::Document() 
@@ -582,7 +582,7 @@ double Document::SwapDouble(double a)
 //
 // -----------------File I/O ---------------
 /**
- * \brief  Tries to open the file \ref Document::Filename and
+ * \brief  Tries to open the file Document::Filename and
  *         checks the preamble when existing,
  *         or if the file starts with an ACR-NEMA look-like element.
  * @return The FILE pointer on success, 0 on failure. 
@@ -721,8 +721,10 @@ void Document::WriteContent(std::ofstream *fp, FileType filetype)
     * --> was too much tricky / we were [in a hurry / too lazy]
     * --> We don't write the element 0x0000 (group length)
     */
-
-   ElementSet::WriteContent(fp, filetype, false); // This one is recursive
+ // This one is recursive
+ // false : outside MetaElements
+ // false : outside Sequence
+   ElementSet::WriteContent(fp, filetype, false, false);
 }
 
 // -----------------------------------------
@@ -851,7 +853,7 @@ void Document::LoadEntryBinArea(DataEntry *entry)
 //}
 
 /**
- * \brief   Compares two documents, according to \ref DicomDir rules
+ * \brief   Compares two documents, according to DicomDir rules
  * \warning Does NOT work with ACR-NEMA files
  * \todo    Find a trick to solve the pb (use RET fields ?)
  * @param   document to compare with current one
@@ -2131,17 +2133,20 @@ bool Document::CheckSwap()
                }
                // Check if next 2 bytes are a VR
                // Probabely something more time-consuming exists with std::string
-               const char VRvalues[] = "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
-               int nbVal = 26;
+               const char VRvalues[] = "AEASATCSDADTFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQRT";
+               int nbVal = 28;
                const char *pt = VRvalues;
                for (int i=0;i<nbVal;i++)
                {
-                  if(*(deb+4) == *pt++)
-                  if(*(deb+5) == *pt++) {
-                     Filetype = ExplicitVR;
-                     return true;       
-                  }
-
+                  if(*(deb+4) == *pt++) {
+                    if(*(deb+5) == *pt++) {
+                       Filetype = ExplicitVR;
+                       return true;
+                    }
+                    else {
+                       pt++;
+                    }
+                 }
               }
               Filetype = ImplicitVR;
               return true;