X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDictSet.cxx;h=99b890200da1d523d2590459992389715e78b44b;hb=d3710448e1a6c462d762a10b9f02ca051bf090e3;hp=79a417d57ccc782061bd303f90236d0b2bc2a0a9;hpb=b6e445adae1963909952eeef10ea7c1d2e0d3e0d;p=gdcm.git

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 79a417d5..99b89020 100644
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -1,20 +1,9 @@
 // gdcmDictEntry
 
-#ifdef _MSC_VER
-//'identifier' : decorated name length exceeded, name was truncated
-//#pragma warning ( disable : 4503 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
+#include "gdcmDictSet.h"
+#include "gdcmUtil.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
-#include "gdcmUtil.h"
-#include "gdcmDictSet.h"
 
 #define PUB_DICT_NAME     "DicomV3Dict"
 #ifndef PUB_DICT_PATH
@@ -50,12 +39,21 @@ std::list<std::string> * gdcmDictSet::GetPubDictTagNames(void) {
  *          A typical usage of this method would be to enable a dynamic
  *          configuration of a Dicom file browser: the admin/user can
  *          select in the interface which Dicom tags should be displayed.
+ * \warning Dicom *doesn't* define any name for any 'categorie'
+ *          (the dictionnary fourth field was formerly NIH defined
+ *           - and no longer he is-
+ *           and will be removed when Dicom provides us a text file
+ *           with the 'official' Dictionnary, that would be more friendly
+ *           than asking us to perform a line by line check od thhe dictionnary
+ *           at the beginning of each year to -try to- guess the changes)
+ *           Therefore : please NEVER use that fourth field :-(
+ *
  * @return  An hashtable: whose keys are the names of the groups and whose
  *          corresponding values are lists of all the dictionnary entries
  *          among that group.
  */
 std::map<std::string, std::list<std::string> > * gdcmDictSet::GetPubDictTagNamesByCategory(void) {
-   std::map<std::string, std::list<std::string> > * Result = new map<std::string, std::list<std::string> >;
+   std::map<std::string, std::list<std::string> > * Result = new std::map<std::string, std::list<std::string> >;
    TagKeyHT entries = GetDefaultPubDict()->GetEntries();
 
    for (TagKeyHT::iterator tag = entries.begin(); tag != entries.end(); ++tag){
@@ -126,9 +124,9 @@ void gdcmDictSet::LoadDictFromFile(std::string FileName, DictKey Name) {
  *          contained is this gdcmDictSet, along with their respective content.
  * @param   os Output stream used for printing.
  */
-void gdcmDictSet::Print(ostream& os) {
+void gdcmDictSet::Print(std::ostream& os) {
    for (DictSetHT::iterator dict = Dicts.begin(); dict != Dicts.end(); ++dict){
-      os << "Printing dictionary " << dict->first << " \n";
+      os << "Printing dictionary " << dict->first << std::endl;
       dict->second->Print(os);
    }
 }