Fix warnings, and fix TestWriteRead

[gdcm.git] / src / gdcmDictEntry.cxx

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index ee04a0c62a7f3a036df8394e5b2defb9da9787d1..8001f2d990cb47604808c18b20593c7425f9522c 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,32 +1,48 @@
-// gdcmDictEntry.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/20 18:08:47 $
+  Version:   $Revision: 1.21 $
+                                                                                
+  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.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmDictEntry.h"
+#include "gdcmDebug.h"
 
 #include <stdio.h>    // FIXME For sprintf
-#include "gdcmUtil.h"
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDictEntry
- * \brief   Construtor
- * @param   InGroup
- * @param   InElement
- * @param   InVr
- * @param   InFourth  // DO NOT use any longer
+ * \brief   Constructor
+ * @param   InGroup    DICOM-Group Number
+ * @param   InElement  DICOM-Element Number
+ * @param   InVr       Value Representatiion
+ * @param   InFourth  // DO NOT use any longer; 
  *                       NOT part of the Dicom Standard
- * @param   InName 
+ * @param   InName    description of the element
 */
 
 gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
                              std::string  InVr, std::string InFourth,
-                             std::string  InName) {
-       group   = InGroup;
-       element         = InElement;
-       vr              = InVr;
-       fourth  = InFourth;
-       name            = InName;
-       key             = TranslateToKey(group, element);
+                             std::string  InName)
+{
+   group   = InGroup;
+   element = InElement;
+   vr      = InVr;
+   fourth  = InFourth;
+   name    = InName;
+   key     = TranslateToKey(group, element); /// \todo Frog MEMORY LEAK.
 }
 
 //-----------------------------------------------------------------------------
@@ -35,18 +51,17 @@ gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \ingroup gdcmDictEntry
  * \brief   concatenates 2 guint16 (supposed to be a Dicom group number 
  *                                             and a Dicom element number)
  * @param  group the Dicom group   number used to build the tag
  * @param  element the Dicom element number used to build the tag
- * return the built tag
+ * @return the built tag
  */
-
-TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) {
+TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element)
+{
        char trash[10];
        TagKey key;
-       // CLEAN ME: better call the iostream<< with the hex manipulator on.
+       // CLEANME: better call the iostream<< with the hex manipulator on.
        // This requires some reading of the stdlibC++ sources to make the
        // proper call (or copy).
        sprintf(trash, "%04x|%04x", group , element);
@@ -55,15 +70,16 @@ TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) {
 }
 
 /**
- * \ingroup     gdcmDictEntry
  * \brief       If-and only if-the V(alue) R(epresentation)
- *              is unset then overwrite it.
+ * \            is unset then overwrite it.
  * @param NewVr New V(alue) R(epresentation) to be set.
  */
-void gdcmDictEntry::SetVR(std::string NewVr) {
+void gdcmDictEntry::SetVR(std::string NewVr) 
+{
        if ( IsVRUnknown() )
                vr = NewVr;
-       else {
+       else 
+   {
                dbg.Error(true, "gdcmDictEntry::SetVR",
                          "Overwriting vr might compromise a dictionary");
        }