Doxygen

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 3dc2920c89d7b885cef9f363e393b0d64210fd76..d4410d1b47a6ca947374137ca51b9c5e360ebba2 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 07:38:58 $
-  Version:   $Revision: 1.302 $
+  Date:      $Date: 2005/10/23 15:28:26 $
+  Version:   $Revision: 1.303 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -684,7 +684,7 @@ void Document::LoadEntryBinArea(DataEntry *entry)
       return;
    }
 
-   // Read the datas
+   // Read the data
    Fp->read((char*)data, l);
    if ( Fp->fail() || Fp->eof() )
    {
@@ -718,7 +718,7 @@ void Document::LoadEntryBinArea(DataEntry *entry)
       }
       case 8:
       {
-         gdcmWarningMacro("Can't swap 64 bits datas");
+         gdcmWarningMacro("Can't swap 64 bits data");
 /*         uint64_t *data64 = (uint64_t *)data;
          for(i=0;i<l/vrLgth;i++)
             data64[i] = SwapLongLong(data64[i]);*/
@@ -903,7 +903,7 @@ int Document::ComputeGroup0002Length( )
             // (no SQ, OW, UT in group 0x0002;)
                if ( vr == "OB" ) 
                {
-                  // explicit VR AND OB, OW, SQ, UT : 4 more bytes
+                  // explicit VR AND (OB, OW, SQ, UT) : 4 more bytes
                   groupLength +=  4;
                }
             //}
@@ -998,16 +998,22 @@ void Document::ParseDES(DocEntrySet *set, long offset,
       if ( newDataEntry )  
       {
          //////////////////////////// DataEntry
+ 
          vr = newDocEntry->GetVR();
+ 
+         // Useless checking, now !
+         /*
          if ( Filetype == ExplicitVR && 
                !Global::GetVR()->IsVROfBinaryRepresentable(vr) )
          { 
                ////// No DataEntry: should mean UNKOWN VR
                gdcmWarningMacro( std::hex << newDocEntry->GetGroup() 
                                  << "|" << newDocEntry->GetElement()
-                                 << " : No DataEntry." 
-                                 "Probably unknown VR.");
+                                 << " : unknown VR." 
+                                 " Probably 'Implicit VR' entry within "
+                                 "an explicit VR 'document'.");
          }
+         */
 
          if ( !set->AddEntry( newDataEntry ) )
          {

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 4c3645fcd312a16cc27408b2427f94eaa08b9f54..b26c57d831b59495ceb2d1c672dbccbe757b29c4 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/21 16:00:55 $
-  Version:   $Revision: 1.288 $
+  Date:      $Date: 2005/10/23 15:26:43 $
+  Version:   $Revision: 1.289 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1785,10 +1785,10 @@ void File::ReadEncapsulatedBasicOffsetTable()
 // These are the deprecated method that one day should be removed (after the next release)
 
 #ifndef GDCM_LEGACY_REMOVE
-/* *
- * \brief  Constructor (DEPRECATED : temporaryly kept not to break the API)
- * @param  filename name of the file whose header we want to analyze
- * @deprecated do not use any longer
+/*
+ *  brief  Constructor (DEPRECATED : temporaryly kept not to break the API)
+ *  param  filename name of the file whose header we want to analyze
+ *  deprecated do not use any longer
  */
 File::File( std::string const &filename )
      :Document( )
@@ -1800,12 +1800,12 @@ File::File( std::string const &filename )
    Load( ); // gdcm::Document is first Loaded, then the 'File part'
 }
 
-/* *
- * \brief   Loader. (DEPRECATED :  temporaryly kept not to break the API)
- * @param   fileName file to be open for parsing
- * @return false if file cannot be open or no swap info was found,
+/*
+ * \ brief   Loader. (DEPRECATED :  temporaryly kept not to break the API)
+ * @ param   fileName file to be open for parsing
+ * @ return false if file cannot be open or no swap info was found,
  *         or no tag was found.
- * @deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
+ * @ deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
  */
 bool File::Load( std::string const &fileName ) 
 {