Cosmetics

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index 54cbce0b43f906898f0be9eaf7aa0488c023fab4..9d0bd87822e784090c3694e50b0b8b810f5f98ae 100644 (file)
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/24 14:14:10 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2005/01/28 17:01:29 $
+  Version:   $Revision: 1.32 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -108,7 +108,6 @@ DicomDirElement::~DicomDirElement()
 // Print
 /**
  * \brief   Print all
- * \todo add a 'Print Level' check 
  * @param   os The output stream to be written to.
  */
 void DicomDirElement::Print(std::ostream &os)

diff --git a/src/gdcmDicomDirImage.cxx b/src/gdcmDicomDirImage.cxx
index 688886fd7bde7a3a0a0ee773067b0fe7df1dd24d..a7024f1f4e53a766372ac7e807cc2067aa17d09a 100644 (file)
--- a/src/gdcmDicomDirImage.cxx
+++ b/src/gdcmDicomDirImage.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirImage.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/23 10:12:33 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/28 17:01:29 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,6 +26,7 @@ namespace gdcm
 // Constructor / Destructor
 /**
  * \brief  Constructor 
+ * \note End user must use : DicomDirSerie::NewImage()
  */
 DicomDirImage::DicomDirImage(bool empty):
    DicomDirObject()

diff --git a/src/gdcmDicomDirPatient.cxx b/src/gdcmDicomDirPatient.cxx
index 72081cf3a763f166569d9caa664ba97d9eb039fe..9b4cd7cd5f60d3cd45973684686f525abc7bddae 100644 (file)
--- a/src/gdcmDicomDirPatient.cxx
+++ b/src/gdcmDicomDirPatient.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirPatient.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 15:44:23 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/01/28 17:01:29 $
+  Version:   $Revision: 1.34 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,6 +30,7 @@ namespace gdcm
 // Constructor / Destructor
 /**
  * \brief   Constructor
+ * \note End user must use : DicomDir::NewPatient()
  */
 DicomDirPatient::DicomDirPatient(bool empty):
    DicomDirObject()

diff --git a/src/gdcmDicomDirSerie.cxx b/src/gdcmDicomDirSerie.cxx
index 3678c9a1b2b266aeca1e18640ae2bc634b4bfc30..7dfcfdfddcc44d3638054109c8ddc6fe41183721 100644 (file)
--- a/src/gdcmDicomDirSerie.cxx
+++ b/src/gdcmDicomDirSerie.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 15:44:23 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/28 17:01:29 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,8 @@ namespace gdcm
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \brief  Constructor 
+ * \brief  Constructor
+ * \note End user must use : DicomDirStudy::NewSerie() 
  */
 DicomDirSerie::DicomDirSerie(bool empty):
    DicomDirObject()
@@ -116,7 +117,7 @@ void DicomDirSerie::ClearImage()
 
 /**
  * \brief   Get the first entry while visiting the DicomDirImage
- * \return  The first DicomDirImage if found, otherwhise NULL
+ * \return  The first DicomDirImage if DicomDirserie not empty, otherwhise NULL
  */
 DicomDirImage *DicomDirSerie::GetFirstImage()
 {
@@ -140,21 +141,6 @@ DicomDirImage *DicomDirSerie::GetNextImage()
       return *ItImage;
    return NULL;
 }
- 
-/**
- * \brief   Get the first entry while visiting the DicomDirImage
- * \return  The first DicomDirImage if found, otherwhise NULL
- */
-DicomDirImage *DicomDirSerie::GetLastImage()
-{
-   ItImage = Images.end();
-   if (ItImage != Images.begin())
-   {
-      --ItImage;
-      return *ItImage;
-   }
-   return NULL;
-}
 
 //-----------------------------------------------------------------------------
 // Protected

diff --git a/src/gdcmDicomDirSerie.h b/src/gdcmDicomDirSerie.h
index 97b67cb96f91dce88eec14cee04f27f821565ba9..21a68c55e762eb1e6d0bbb0ef306994d84dbe415 100644 (file)
--- a/src/gdcmDicomDirSerie.h
+++ b/src/gdcmDicomDirSerie.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirSerie.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 11:11:58 $
-  Version:   $Revision: 1.24 $
+  Date:      $Date: 2005/01/28 17:01:29 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -44,7 +44,6 @@ public:
    // should avoid exposing internal mechanism
    DicomDirImage *GetFirstImage();
    DicomDirImage *GetNextImage();
-   DicomDirImage *GetLastImage();
         
    /// adds the passed IMAGE to the IMAGE chained List for this SERIE.    
    void AddImage(DicomDirImage *obj) { Images.push_back(obj); };

diff --git a/src/gdcmDicomDirStudy.cxx b/src/gdcmDicomDirStudy.cxx
index 8975dabdb0d4b825e69296f6aa358bba45aa75d4..4075c91484ec1103b46cc5ebd6f5bda76155d718 100644 (file)
--- a/src/gdcmDicomDirStudy.cxx
+++ b/src/gdcmDicomDirStudy.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirStudy.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/25 15:44:23 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2005/01/28 17:01:29 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,6 +28,7 @@ namespace gdcm
 // Constructor / Destructor
 /**
  * \brief  Constructor 
+ * \note End user must use : DicomDirPatient::NewStudy()
  */
 DicomDirStudy::DicomDirStudy(bool empty):
    DicomDirObject()

diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h
index 6f1f234e836d76b0c9f4e4b0fbd2641ad096d024..171a1a6972ccf0ac011ce88fc891d845b9719d7e 100644 (file)
--- a/src/gdcmDirList.h
+++ b/src/gdcmDirList.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/23 10:12:33 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2005/01/28 17:01:30 $
+  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
@@ -37,7 +37,7 @@ typedef std::vector<std::string> DirListType;
 
 /**
  * \ingroup DirList
- * \brief   List containing the file Header s of all the gdcm readable files
+ * \brief   List containing the file headers of all the gdcm readable files
  *          found by exploring recursively a root directory. 
  */
 class GDCM_EXPORT DirList

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 477b55e9376507fa5b43c08b8253880e4610a6d5..cfd5d662a13f985c549d3a8709c302ba5fb5f599 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/26 17:17:31 $
-  Version:   $Revision: 1.100 $
+  Date:      $Date: 2005/01/28 17:01:30 $
+  Version:   $Revision: 1.101 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -172,7 +172,9 @@ public:
 
    bool Write(std::string fileName, FileType filetype);
 
+   /// returns the RLE info
    RLEFramesInfo *GetRLEInfo() { return RLEInfo; }
+   /// Returns the JPEG Fragments info
    JPEGFragmentsInfo *GetJPEGInfo() { return JPEGInfo; }
 
 protected:

diff --git a/src/gdcmJPEGFragmentsInfo.cxx b/src/gdcmJPEGFragmentsInfo.cxx
index 0a905ad4cd24f44d16d0a1aaf5562b557d794a1d..93e2b0fb311265e485acda5f7e7da4a626daf833 100644 (file)
--- a/src/gdcmJPEGFragmentsInfo.cxx
+++ b/src/gdcmJPEGFragmentsInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/28 15:42:22 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2005/01/28 17:01:30 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -108,7 +108,11 @@ void JPEGFragmentsInfo::ReadAllFragments(std::ifstream *fp, JOCTET *buffer )
 
 }
 
-void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int numBytes, int length)
+// Keep a track of the old code (maybe Jpeg2000 lib will be less clever than IJG
+//void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int numBytes, int length)
+
+// to avoid warnings
+void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int , int )
 {
    // Pointer to the Raw image
    uint8_t *localRaw = buffer;

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 57e1ce08d913f7eab8ce5f53a72da6f129ef5079..e50ccc1bdecda922c88dd8258926f8d1ee57087d 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/17 11:13:21 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2005/01/28 17:01:30 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,6 +31,7 @@ void FillDefaultVRDict(VRHT &vr);
 /**
  * \brief Constructor
  */
+ 
 VR::VR() 
 {
    std::string filename = DictSet::BuildDictPath() + DICT_VR;