LEGACY purpose

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index c597d65e75d1b67dd0f6416df014ff3786f4d23b..de857ed3a281bbff8316e1666f6b5dacba083b40 100644 (file)
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/20 14:49:42 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/07/21 05:02:11 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,7 +40,7 @@ namespace gdcm
  *             proper input and proper output. 
  *             (should not happen, not user controlled)
  * 
- * A debugging message is only show if the flag is on (DebugFlag)
+ * A debugging message is only shown if the flag is on (DebugFlag)
  * This is static var and can be set at beginning of code:
  *         gdcm::Debug::SetDebugOn();
  */

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 12eb27468ecaf018980834809cc03b221d76b7b7..52d239d7f7283d8989fd900bb89f7978d30977a6 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/20 14:49:41 $
-  Version:   $Revision: 1.150 $
+  Date:      $Date: 2005/07/21 05:02:11 $
+  Version:   $Revision: 1.151 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -123,6 +123,7 @@ DicomDir::DicomDir()
    NewMeta();
 }
 
+#ifndef GDCM_LEGACY_REMOVE
 /**
  * \brief Constructor Parses recursively the directory and creates the DicomDir
  *        or uses an already built DICOMDIR, depending on 'parseDir' value.
@@ -137,7 +138,6 @@ DicomDir::DicomDir()
  * @deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name)
  *              or : new DicomDir() + SetFileName(name)
  */
-#ifndef GDCM_LEGACY_REMOVE
 DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
    Document( )
 {
@@ -212,7 +212,7 @@ bool DicomDir::Load(std::string const &fileName )
    return DoTheLoadingJob( );
 }
 
-/// DEPRECATED : use SetDirectoryName(dn) instead
+/// DEPRECATED : use SetDirectoryName(dname) instead
 void DicomDir::SetParseDir(bool parseDir)
 {
    ParseDir = parseDir;

diff --git a/src/gdcmDicomDir.h b/src/gdcmDicomDir.h
index b47c3d306f8997f6802e4909b5a78aabb4f67746..f51c9f4cd0a8b4d8e3a1e5c73fe659d7241673b1 100644 (file)
--- a/src/gdcmDicomDir.h
+++ b/src/gdcmDicomDir.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/20 14:49:42 $
-  Version:   $Revision: 1.65 $
+  Date:      $Date: 2005/07/21 05:02:11 $
+  Version:   $Revision: 1.66 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -64,11 +64,11 @@ public:
    /// Sets the root Directory name to parse, recursively
    void SetDirectoryName(std::string const &dirName) 
         { ParseDir = true; if (Filename != dirName)
-                               Filename = dirName, IsDocumentModified = true; };
+                               Filename = dirName, IsDocumentModified = true; }
    /// Accessor to \ref Filename
    virtual void SetFileName(std::string const &fileName) 
                    { ParseDir = false; if (Filename != fileName)
-                              Filename = fileName, IsDocumentModified = true;};
+                              Filename = fileName, IsDocumentModified = true;}
 
    /// DEPRECATED : use SetDirectoryName
    GDCM_LEGACY( void SetParseDir(bool parseDir) );
@@ -79,7 +79,7 @@ public:
    // Meta
    DicomDirMeta *NewMeta();
    /// Returns a pointer to the DicomDirMeta for this DICOMDIR. 
-   DicomDirMeta *GetMeta() { return MetaElems; };
+   DicomDirMeta *GetMeta() { return MetaElems; }
 
    // Patients
    DicomDirPatient *NewPatient();
@@ -108,11 +108,11 @@ public:
    void SetEndMethodArgDelete     ( DicomDir::Method *m );
 
    /// GetProgress GetProgress
-   float GetProgress()   { return Progress; };
+   float GetProgress()   { return Progress; }
    /// AbortProgress AbortProgress
-   void  AbortProgress() { Abort = true; };
+   void  AbortProgress() { Abort = true; }
    /// IsAborted IsAborted
-   bool  IsAborted() { return Abort; };
+   bool  IsAborted() { return Abort; }
 
    // Write
    bool WriteDicomDir(std::string const &fileName);

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 572171d0355c5e5ced296a2b7e370e1e5ab7bc4a..1a0be66eae699c31abc456e2407bfc782e5984e3 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/18 10:20:20 $
-  Version:   $Revision: 1.58 $
+  Date:      $Date: 2005/07/21 05:02:12 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -57,7 +57,8 @@ public:
    static std::string DicomString(const char *s, size_t l);
    static std::string DicomString(const char *s);
    static bool        DicomStringEqual(const std::string &s1, const char *s2);
-   static bool        CompareDicomString(const std::string &s1, const char *s2, int op);
+   static bool        CompareDicomString(const std::string &s1, 
+                                         const char *s2, int op);
    static std::string GetMACAddress();
 
    static std::string CreateUniqueUID(const std::string &root = "");