From: malaterre <malaterre>
Date: Thu, 26 Jan 2006 15:52:38 +0000 (+0000)
Subject: ENH: Finally I got ArgMgr to be const string instead of char*... strcasecmp is POSIX... 
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=48f7ce7aa61778477992107caf15e8960359e66b;p=gdcm.git

ENH: Finally I got ArgMgr to be const string instead of char*... strcasecmp is POSIX why not use it...
---

diff --git a/Dicts/CMakeLists.txt b/Dicts/CMakeLists.txt
index c80ef577..ca7ee0f5 100644
--- a/Dicts/CMakeLists.txt
+++ b/Dicts/CMakeLists.txt
@@ -5,10 +5,13 @@
 # Generate our own 'DICOM' dictionary, based on the following dictionaries:
 SET(ALL_DICTS
   dicomV3.dic
-  Papyrus.dic
-  NIH.dic     #the forbidden one...
-  SPI.dic
+  #Papyrus.dic
+  #NIH.dic     #the forbidden one...
+  #  SPI.dic
   #  PHILIPS-Intera.dic # uncomment me if you want
+  GEMS.dic
+  #GEMS-HiSpeed.dic
+  #  GEMS-Advance.dic
   )
 
 # Better solution
diff --git a/Example/AnonymizeNoLoad.cxx b/Example/AnonymizeNoLoad.cxx
index 298e5dce..b212f36b 100644
--- a/Example/AnonymizeNoLoad.cxx
+++ b/Example/AnonymizeNoLoad.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: AnonymizeNoLoad.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/02 15:16:38 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2006/01/26 15:52:42 $
+  Version:   $Revision: 1.16 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -60,8 +60,8 @@ int main(int argc, char *argv[])
    if (am->ArgMgrDefined("debug"))
       gdcm::Debug::DebugOn();
 
-   char *fileName = am->ArgMgrGetString("filein",(char *)0);
-   char *dirName  = am->ArgMgrGetString("dirin",(char *)0);
+   const char *fileName = am->ArgMgrGetString("filein");
+   const char *dirName  = am->ArgMgrGetString("dirin");
 
    if ( (fileName == 0 && dirName == 0)
         ||
diff --git a/Example/MagnetomVisionToBrucker.cxx b/Example/MagnetomVisionToBrucker.cxx
index 684994ca..cf3b7a48 100755
--- a/Example/MagnetomVisionToBrucker.cxx
+++ b/Example/MagnetomVisionToBrucker.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: MagnetomVisionToBrucker.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/25 16:59:19 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2006/01/26 15:52:42 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -108,11 +108,11 @@ int main(int argc, char *argv[])
       return 0;
    }
 
-   char *dirNamein;   
-   dirNamein  = am->ArgMgrGetString("dirin",(char *)"."); 
+   const char *dirNamein;   
+   dirNamein  = am->ArgMgrGetString("dirin","."); 
 
-   char *dirNameout;   
-   dirNameout  = am->ArgMgrGetString("dirout",(char *)".");  
+   const char *dirNameout;   
+   dirNameout  = am->ArgMgrGetString("dirout",".");  
    
    int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
       return 0;         
    }
    
-   char *extent  = am->ArgMgrGetString("extent",".DCM");
+   const char *extent  = am->ArgMgrGetString("extent",".DCM");
    
    // if unused Param we give up
    if ( am->ArgMgrPrintUnusedLabels() )
diff --git a/Example/MakeDicomDir.cxx b/Example/MakeDicomDir.cxx
index c7200716..2fc7051e 100644
--- a/Example/MakeDicomDir.cxx
+++ b/Example/MakeDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: MakeDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/18 10:20:56 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2006/01/26 15:52:42 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -61,11 +61,11 @@ int main(int argc, char *argv[])
       return 0;
    }
 
-   char *dirName;   
-   dirName  = am->ArgMgrGetString("dirName",(char *)"."); 
+   const char *dirName;   
+   dirName  = am->ArgMgrGetString("dirName","."); 
 
-   char *name;
-   name  = am->ArgMgrGetString("name",(char *)"DICOMDIR");
+   const char *name;
+   name  = am->ArgMgrGetString("name","DICOMDIR");
    
    int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
diff --git a/Example/PatchHeader.cxx b/Example/PatchHeader.cxx
index e88de916..f93cc5d3 100644
--- a/Example/PatchHeader.cxx
+++ b/Example/PatchHeader.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PatchHeader.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/25 14:52:27 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2006/01/26 15:52:42 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -192,8 +192,8 @@ int main(int argc, char *argv[])
       return 0;
    }
 
-   char *fileName = am->ArgMgrGetString("filein",(char *)0);
-   char *dirName  = am->ArgMgrGetString("dirin",(char *)0);
+   const char *fileName = am->ArgMgrGetString("filein");
+   const char *dirName  = am->ArgMgrGetString("dirin");
 
    if ( (fileName == 0 && dirName == 0)
         ||
diff --git a/Example/PhilipsToBrucker.cxx b/Example/PhilipsToBrucker.cxx
index a532b83a..a1cbe760 100755
--- a/Example/PhilipsToBrucker.cxx
+++ b/Example/PhilipsToBrucker.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PhilipsToBrucker.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/18 15:45:20 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2006/01/26 15:52:42 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -92,11 +92,11 @@ int main(int argc, char *argv[])
       return 0;
    }
 
-   char *dirNamein;
-   dirNamein  = am->ArgMgrGetString("dirin",(char *)"."); 
+   const char *dirNamein;
+   dirNamein  = am->ArgMgrGetString("dirin","."); 
 
-   char *dirNameout;   
-   dirNameout  = am->ArgMgrGetString("dirout",(char *)".");  
+   const char *dirNameout;   
+   dirNameout  = am->ArgMgrGetString("dirout",".");  
    
    int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
       return 0;         
    }
    
-   char *extent  = am->ArgMgrGetString("extent",".DCM");
+   const char *extent  = am->ArgMgrGetString("extent",".DCM");
         
    // if unused Param we give up
    if ( am->ArgMgrPrintUnusedLabels() )
diff --git a/Example/PhilipsToBrucker2.cxx b/Example/PhilipsToBrucker2.cxx
index 3d818200..fb5ea0cf 100755
--- a/Example/PhilipsToBrucker2.cxx
+++ b/Example/PhilipsToBrucker2.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PhilipsToBrucker2.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/25 17:02:00 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2006/01/26 15:52:43 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -110,11 +110,11 @@ int main(int argc, char *argv[])
       return 0;
    }
 
-   char *dirNamein;   
-   dirNamein  = am->ArgMgrGetString("dirin",(char *)"."); 
+   const char *dirNamein;   
+   dirNamein  = am->ArgMgrGetString("dirin","."); 
 
-   char *dirNameout;   
-   dirNameout  = am->ArgMgrGetString("dirout",(char *)".");  
+   const char *dirNameout;   
+   dirNameout  = am->ArgMgrGetString("dirout",".");  
    
    int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
       return 0;         
    }
    
-   char *extent  = am->ArgMgrGetString("extent",".DCM");
+   const char *extent  = am->ArgMgrGetString("extent",".DCM");
    
    // if unused Param we give up
    if ( am->ArgMgrPrintUnusedLabels() )
diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index f3b9da41..a8c61272 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/19 11:43:48 $
-  Version:   $Revision: 1.78 $
+  Date:      $Date: 2006/01/26 15:52:43 $
+  Version:   $Revision: 1.79 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -151,8 +151,8 @@ int main(int argc, char *argv[])
       return 1;
    }
 
-   char *fileName = am->ArgMgrGetString("filein",(char *)0);
-   char *dirName  = am->ArgMgrGetString("dirin",(char *)0);
+   const char *fileName = am->ArgMgrGetString("filein");
+   const char *dirName  = am->ArgMgrGetString("dirin");
 
    if ( (fileName == 0 && dirName == 0) ||
         (fileName != 0 && dirName != 0) )
@@ -191,11 +191,11 @@ int main(int argc, char *argv[])
    bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
 
    bool ddict = am->ArgMgrDefined("dict") ? true : false;
-   char *dict = 0;
+   const char *dict = 0;
 
    if (ddict)
    {
-     dict = am->ArgMgrGetString("dict",(char *)0);
+     dict = am->ArgMgrGetString("dict",0);
    }
 
    /* if unused Param we give up */
diff --git a/Example/RawToDicom.cxx b/Example/RawToDicom.cxx
index f0c469ae..9ad14ca1 100755
--- a/Example/RawToDicom.cxx
+++ b/Example/RawToDicom.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: RawToDicom.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/16 16:38:24 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2006/01/26 15:52:43 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -61,11 +61,11 @@ int main(int argc, char *argv[])
       return 1;
    }
 
-   char *inputFileName  = am->ArgMgrGetString("filein",(char *)0);
-   char *outputFileName = am->ArgMgrGetString("fileout",(char *)0);   
-   //char *dirName        = am->ArgMgrGetString("dirin",(char *)0);
+   const char *inputFileName  = am->ArgMgrGetString("filein");
+   const char *outputFileName = am->ArgMgrGetString("fileout");
+   //const char *dirName        = am->ArgMgrGetString("dirin");
    
-   char *patientName = am->ArgMgrGetString("patientname",(char *)0);
+   const char *patientName = am->ArgMgrGetString("patientname");
    
    int nX = am->ArgMgrWantInt("rows", usage);
    int nY = am->ArgMgrWantInt("lines", usage);
diff --git a/Example/ReWrite.cxx b/Example/ReWrite.cxx
index 9cdab8e3..1cabef1b 100644
--- a/Example/ReWrite.cxx
+++ b/Example/ReWrite.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: ReWrite.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/07 09:53:53 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2006/01/26 15:52:43 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
       return 0;
    }
 
-   char *mode = am->ArgMgrGetString("mode",(char *)"X");
+   const char *mode = am->ArgMgrGetString("mode","X");
 
    int loadMode = gdcm::LD_ALL;
    if ( am->ArgMgrDefined("noshadowseq") )
diff --git a/Example/exXCoherentFileSet.cxx b/Example/exXCoherentFileSet.cxx
index db2dd0e1..567eff75 100755
--- a/Example/exXCoherentFileSet.cxx
+++ b/Example/exXCoherentFileSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exXCoherentFileSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/14 15:55:17 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2006/01/26 15:52:43 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
          loadMode |= gdcm::LD_NOSEQ;
    }
 
-   char *dirName  = am->ArgMgrGetString("dirin",(char *)0);
+   const char *dirName  = am->ArgMgrGetString("dirin");
    if (dirName == 0)
    {
        std::cout <<std::endl
diff --git a/src/gdcmArgMgr.cxx b/src/gdcmArgMgr.cxx
index 32e3765e..d54aae7c 100644
--- a/src/gdcmArgMgr.cxx
+++ b/src/gdcmArgMgr.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/22 14:46:06 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2006/01/26 15:52:56 $
+  Version:   $Revision: 1.17 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -277,7 +277,7 @@ float ArgMgr::ArgMgrGetFloat(const char *param, float defaultVal)
  * @param defaultVal default value
  * @return parameter value
  */
-char *ArgMgr::ArgMgrGetString(const char *param, char *defaultVal)
+const char *ArgMgr::ArgMgrGetString(const char *param, const char *defaultVal)
 {
    return    ( (ArgMgrDefined(param)) 
               ? (ArgMgrValue(param))
@@ -298,19 +298,20 @@ char *ArgMgr::ArgMgrGetString(const char *param, char *defaultVal)
 int ArgMgr::ArgMgrGetLabel (const char *param, char *liste, int val )
 {
   char *lab;
-  char *vallab;
+  const char *vallab;
   int i = 1;
   char *tmp;
   tmp = (char *) malloc(strlen(liste)+1);
   strcpy(tmp,liste);
 
-  if ( (vallab = ArgMgrGetString(param,(char *)NULL)) != 0 ) 
+  if ( (vallab = ArgMgrGetString(param,(const char *)NULL)) != 0 ) 
   { 
      for ( lab = strtok (tmp,"\\"); 
            lab != 0; 
            lab = strtok(0L,"\\"), i++ )
      { 
-        if ( strcmp(maj(lab),maj(vallab))==0)
+        // strcmp ignoring case
+        if( strcasecmp(lab, vallab) == 0)
            return i;
      } 
      val=0;
@@ -332,12 +333,12 @@ int ArgMgr::ArgMgrGetLabel (const char *param, char *liste, int val )
 int ArgMgr::ArgMgrWantLabel (const char *param, char *liste, const char **usage )
 {
    char *lab;
-   char *vallab;
+   const char *vallab;
    int i = 1;
    if ( (vallab = ArgMgrGetString(param,0)) != 0 ) 
    {
       for ( lab = strtok (liste,"\\"); lab != 0; lab = strtok(0L,"\\"), i++ )
-        if ( strcmp(maj(lab),maj(vallab))==0) 
+        if ( strcasecmp(lab,vallab)==0) 
            return i;
       return 0;
    }
diff --git a/src/gdcmArgMgr.h b/src/gdcmArgMgr.h
index 18b6454c..6f4ea8fd 100644
--- a/src/gdcmArgMgr.h
+++ b/src/gdcmArgMgr.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmArgMgr.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/28 16:56:05 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2006/01/26 15:52:56 $
+  Version:   $Revision: 1.11 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -63,7 +63,7 @@ public:
 
    int    ArgMgrGetInt   (const char *param, int);  // Gets an int   (with default value)
    float  ArgMgrGetFloat (const char *param, float);// Gets a float  (with default value)
-   char  *ArgMgrGetString(const char *param, char*);// Gets a string (with default value)
+   const char  *ArgMgrGetString(const char *param, const char* ext = 0);// Gets a string (with default value)
    int    ArgMgrGetLabel (const char *param, char *, int);
   
    int    ArgMgrWantInt   (const char *param, const char **usage);  // Demands an int