ENH: Fix a shadow variable

[gdcm.git] / src / gdcmDictEntry.cxx

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 598a083ca58c50a0fd463af00fdb5e791ea17f80..bb4e748bd7b8e153ddf08c8434c9aaedf6f4f406 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,5 +1,21 @@
-// gdcmDictEntry.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictEntry.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/07/02 13:55:27 $
+  Version:   $Revision: 1.22 $
+                                                                                
+  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"
 
@@ -17,7 +33,7 @@
  * @param   InName    description of the element
 */
 
-gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
+gdcmDictEntry::gdcmDictEntry(uint16_t InGroup, uint16_t InElement,
                              std::string  InVr, std::string InFourth,
                              std::string  InName)
 {
@@ -35,22 +51,22 @@ gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \brief   concatenates 2 guint16 (supposed to be a Dicom group number 
+ * \brief   concatenates 2 uint16_t (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
  */
-TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element)
+gdcmTagKey gdcmDictEntry::TranslateToKey(uint16_t group, uint16_t element)
 {
-       char trash[10];
-       TagKey key;
-       // 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);
-       key = trash;  // Convertion through assignement
-       return key;
+   char trash[10];
+   gdcmTagKey key;
+   // 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);
+   key = trash;  // Convertion through assignement
+   return key;
 }
 
 /**
@@ -60,13 +76,13 @@ TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element)
  */
 void gdcmDictEntry::SetVR(std::string NewVr) 
 {
-       if ( IsVRUnknown() )
-               vr = NewVr;
-       else 
+   if ( IsVRUnknown() )
+      vr = NewVr;
+   else 
    {
-               dbg.Error(true, "gdcmDictEntry::SetVR",
-                         "Overwriting vr might compromise a dictionary");
-       }
+      dbg.Error(true, "gdcmDictEntry::SetVR",
+                       "Overwriting vr might compromise a dictionary");
+   }
 }
 
 //-----------------------------------------------------------------------------