X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmArgMgr.h;h=6d84ca5414ff53868178ace869811f323649e2a0;hb=224876ca6cbe71952f2a1d66d9853eca7745d3a0;hp=1bef9868fa3364181e42daf19832837f2289b57e;hpb=d8f1da6691e4ec0aeacf4b3e1c68fc2812f28cc6;p=gdcm.git

diff --git a/src/gdcmArgMgr.h b/src/gdcmArgMgr.h
index 1bef9868..6d84ca54 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/07/20 13:29:42 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2007/09/28 11:03:52 $
+  Version:   $Revision: 1.14 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,7 +23,7 @@
 #include <stdio.h>  // for FILE
 #include <stdlib.h> // For atof
 
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 
 #define ID_RFILE_TEXT        "rt"
@@ -56,15 +56,15 @@ public:
 
    int    ArgMgrDefined           (const char *param);  // Checks if Param is defined
    char  *ArgMgrValue             (const char *param);  // Returns Param value 
-   char  *ArgMgrUnused            (void);               // Returns a never used arg.
-   int    ArgMgrSave              (char *);             // Save of parameters out
+   const char  *ArgMgrUnused      (void);               // Returns a never used arg.
+   int    ArgMgrSave              (const char *);       // Save of parameters out
    int    ArgMgrUsage             (const char **usage); // Display program usage 
    int    ArgMgrPrintUnusedLabels (void);               // Prints unused labels
 
    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)
-   int    ArgMgrGetLabel (const char *param, char *, int);
+   const char  *ArgMgrGetString(const char *param, const char* ext = 0);// Gets a string (with default value)
+   int    ArgMgrGetLabel (const char *param, const char *, int);
   
    int    ArgMgrWantInt   (const char *param, const char **usage);  // Demands an int 
    float  ArgMgrWantFloat (const char *param, const char **usage);  // Demands a float
@@ -81,9 +81,9 @@ public:
 
 private :
 
-   int    FiltreLong       (char *);
+   int    FiltreLong       (const char *);
    const char  *LoadedParam(const char *, FILE *);
-   int    ArgLoadFromFile  (char *);
+   int    ArgLoadFromFile  (const char *);
    void   ArgStdArgs       (void);
 
    // These ones are 'general purpose methods'
@@ -102,8 +102,8 @@ private :
    const char *ArgParamOut;    // Output File Name for param
 
    char *ArgUsed;              // Used Arguments 
-   char *ArgLab[ARGMAXCOUNT];  // Arguments Labels
-   char *ArgStr[ARGMAXCOUNT];  // Arguments 'strings'
+   char **ArgLab; //[ARGMAXCOUNT];  // Arguments Labels
+   char **ArgStr; //[ARGMAXCOUNT];  // Arguments 'strings'
    int   ArgCount;             // Number of arguments passed 
    char *Appel;                
 };