ENH: Upcomming gcc4 is more picky about casting streampos to integer type

[gdcm.git] / src / gdcmDefaultDicts.cxx.in

diff --git a/src/gdcmDefaultDicts.cxx.in b/src/gdcmDefaultDicts.cxx.in
index 1b54f0b19b9e581554ba7be8a68a230c5c4901d7..fb0aab066747e103e1ec84efa67cdc5969d20846 100644 (file)
--- a/src/gdcmDefaultDicts.cxx.in
+++ b/src/gdcmDefaultDicts.cxx.in
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDefaultDicts.cxx.in,v $
   Language:  C++
-  Date:      $Date: 2004/11/03 18:08:56 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2004/11/04 15:20:35 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,9 +32,9 @@ typedef struct
 {
   uint16_t group;
   uint16_t element;
-  char *vr;
-  char *fourth;
-  char *name;
+  const char *vr;
+  const char *fourth;
+  const char *name;
 } DICT_ENTRY;
 
 static DICT_ENTRY datadir[] = {
@@ -65,10 +65,10 @@ void FillDefaultVRDict(VRHT & vr)
 
 typedef struct
 {
-  char *type;
+  const char *type;
   unsigned short group;
   unsigned short element;
-  char *value;
+  const char *value;
 } ELEMENT;
 
 static ELEMENT dataelement[] = {
@@ -85,26 +85,7 @@ void FillDefaultDIRDict(DicomDirElement *dde)
     elem.Group = e.group;
     elem.Elem  = e.element;
     elem.Value = e.value;
-    if( strcmp(e.type, "metaElem" ) == 0 )
-      {
-      dde->GetDicomDirMetaElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "patientElem" ) == 0 )
-      {
-      dde->GetDicomDirPatientElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "studyElem" ) == 0 )
-      {
-      dde->GetDicomDirStudyElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "serieElem" ) == 0 )
-      {
-      dde->GetDicomDirSerieElements().push_back(elem);
-      }
-    else if( strcmp(e.type, "imageElem" ) == 0 )
-      {
-      dde->GetDicomDirImageElements().push_back(elem);
-      }
+    dde->AddNewEntry( e.type, elem);
     e = dataelement[++i];
     }
 }