FIX : gdcmObject::ResetBoundaries now stops properly when end-of-list is reached

[gdcm.git] / src / gdcmHeaderHelper.cxx

diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx
index 4317a6f8caf9694dabc8616eb8d2e52baf9cd9a4..3410c65bf58e54fc40e25a268d30cec761ac1625 100644 (file)
--- a/src/gdcmHeaderHelper.cxx
+++ b/src/gdcmHeaderHelper.cxx
@@ -3,14 +3,12 @@
 #include "gdcmHeaderHelper.h"
 #include "gdcmDirList.h"
 
-#include "gdcmUtil.h" //for debug
+#include "gdcmDebug.h"
 #include <math.h>
 #include <algorithm>
+#include <vector>
 
 //-----------------------------------------------------------------------------
-// gdcmHeaderHelper
-//-----------------------------------------------------------------------------
-// Constructor / Destructor
 /**
  * \ingroup gdcmHeaderHelper
  * \brief   constructor
@@ -122,7 +120,7 @@ std::string gdcmHeaderHelper::GetPixelType() {
 /**
   * \ingroup gdcmHeaderHelper
   * \brief gets the info from 0028,0030 : Pixel Spacing
-  *             else 1.
+  *             else 1.0
   * @return X dimension of a pixel
   */
 float gdcmHeaderHelper::GetXSpacing() {
@@ -146,7 +144,7 @@ float gdcmHeaderHelper::GetXSpacing() {
 /**
   * \ingroup gdcmHeaderHelper
   * \brief gets the info from 0028,0030 : Pixel Spacing
-  *             else 1.
+  *             else 1.0
   * @return Y dimension of a pixel
   */
 float gdcmHeaderHelper::GetYSpacing() {
@@ -171,7 +169,7 @@ float gdcmHeaderHelper::GetYSpacing() {
   *\ingroup gdcmHeaderHelper
   *\brief gets the info from 0018,0088 : Space Between Slices
   *                else from 0018,0050 : Slice Thickness
-  *                else 1.
+   *                else 1.0
   * @return Z dimension of a voxel-to be
   */
 float gdcmHeaderHelper::GetZSpacing() {
@@ -280,8 +278,8 @@ int gdcmHeaderHelper::GetNumberOfScalarComponents() {
 /**
   * \ingroup gdcmHeaderHelper
   * \brief This function is intended to user that DOESN'T want 
-  * \to get RGB pixels image when it's stored as a PALETTE COLOR image
-  * \ - the (vtk) user is supposed to know how deal with LUTs - 
+  *  to get RGB pixels image when it's stored as a PALETTE COLOR image
+  *   - the (vtk) user is supposed to know how deal with LUTs - 
   * \warning to be used with GetImagePixelsRaw()
   * @return 1 if Gray level, 3 if Color (RGB or YBR - NOT 'PALETTE COLOR' -)
   */
@@ -788,7 +786,7 @@ bool gdcmSerieHeaderHelper::ImagePositionPatientOrdering()
 
 bool gdcmSerieHeaderHelper::ImageNumberOrdering() {
   int min, max, pos;
-  int n = 0;//CoherentGdcmFileList.size(); //O(N) operation !!
+  int n = 0;//CoherentGdcmFileList.size() is a O(N) operation !!
   unsigned char *partition;
   
   std::list<gdcmHeaderHelper*>::iterator it  = CoherentGdcmFileList.begin();