STYLE: remove GetNextttttt + minor Doc

diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx
index e3569967180264d0184d685be5bddf91c9556228..b16e4bf1e084b244bb20d24c68b191d63b35919c 100644 (file)
--- a/src/gdcmJPEGFragment.cxx
+++ b/src/gdcmJPEGFragment.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragment.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/31 04:00:04 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2005/01/31 04:15:33 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -76,12 +76,12 @@ void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp,
    }
    else if ( nBits <= 12 )
    {
-      // JPEG Lossy : call to IJG 6b - 8 bits
+      // JPEG Lossy : call to IJG 6b - 12 bits
       ReadJPEGFile12 ( fp, buffer, statesuspension);
    }
    else if ( nBits <= 16 )
    {
-      // JPEG Lossy : call to IJG 6b - 8 bits
+      // JPEG Lossy : call to IJG 6b - 16 bits
       ReadJPEGFile16 ( fp, buffer, statesuspension);
       //gdcmAssertMacro( IsJPEGLossless );
    }

diff --git a/src/gdcmJPEGFragmentsInfo.cxx b/src/gdcmJPEGFragmentsInfo.cxx
index 4e038ce18cdf19ac332aee59bf2b0e3635521e12..b76548b94662da8130bfb3fac3baee360b09a888 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/31 04:00:04 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2005/01/31 04:15:33 $
+  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
@@ -69,25 +69,6 @@ void JPEGFragmentsInfo::Print( std::ostream &os, std::string const &indent )
    os << std::endl;
 }
 
-/**
- * \brief  Calculate sum of all fragments length and return total
- * @return Total size of JPEG fragments length
- */
-size_t JPEGFragmentsInfo::GetFragmentsLength()
-{
-   // Loop on the fragment[s] to get total length
-   size_t totalLength = 0;
-   JPEGFragmentsList::const_iterator it;
-   for( it  = Fragments.begin();
-        it != Fragments.end();
-        ++it )
-   {
-      totalLength += (*it)->GetLength();
-   }
-   return totalLength;
-}
-
-// to avoid warnings
 void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int , int )
 {
    // Pointer to the Raw image
@@ -99,15 +80,9 @@ void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t
         it != Fragments.end();
         ++it )
    {
-     //(*it)->pimage = localRaw;
      (*it)->DecompressJPEGFramesFromFile(fp, localRaw, nBits, StateSuspension);
      // update pointer to image after some scanlines read:
      localRaw = (*it)->GetImage();
-      // Advance to next free location in Raw 
-      // for next fragment decompression (if any)
-
-      //localRaw += length * numBytes;
-     //std::cerr << "Used to increment by: " << length * numBytes << std::endl;
    }
 }
 

diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h
index 8aac16936c68f912238c38aa3467969ddf55af8d..0a09573fed59a863335f959ba3469ab891812a29 100644 (file)
--- a/src/gdcmJPEGFragmentsInfo.h
+++ b/src/gdcmJPEGFragmentsInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJPEGFragmentsInfo.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/31 04:00:04 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/01/31 04:15:33 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -43,7 +43,6 @@ public:
    JPEGFragmentsInfo();
    ~JPEGFragmentsInfo();
    void Print( std::ostream &os = std::cout, std::string const & indent = "" );
-   size_t GetFragmentsLength();
 
    void DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t *buffer, int nBits, int numBytes, int length);
 

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 9338248a130141a5161773f0c6c32536862062c6..6522520099437524bb7af3ff436318976f747fbb 100644 (file)
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/31 04:00:05 $
-  Version:   $Revision: 1.39 $
+  Date:      $Date: 2005/01/31 04:15:33 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -256,7 +256,7 @@ bool PixelReadConvert::ReadAndDecompressRLEFile( std::ifstream *fp )
                                       fp);
          subRaw += RawSegmentSize;
       }
-      frame = RLEInfo->GetNexttFrame();
+      frame = RLEInfo->GetNextFrame();
    }
 
    if ( BitsAllocated == 16 )

diff --git a/src/gdcmRLEFramesInfo.cxx b/src/gdcmRLEFramesInfo.cxx
index ba65b834c394c5b340d13358cd478e0c498be9b6..7fece3c5c2ede39a26d9fba2f23df1986e9ddf99 100644 (file)
--- a/src/gdcmRLEFramesInfo.cxx
+++ b/src/gdcmRLEFramesInfo.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/28 15:42:22 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2005/01/31 04:15:33 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -68,7 +68,7 @@ RLEFrame *RLEFramesInfo::GetFirstFrame()
    return NULL;
 }
 
-RLEFrame *RLEFramesInfo::GetNexttFrame()
+RLEFrame *RLEFramesInfo::GetNextFrame()
 {
    gdcmAssertMacro (ItFrames != Frames.end());
 

diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h
index dfc3d89c868c2a738d7f377d5bfa015f7216e758..d5fad91e9defccf9c077a28987379f8760739d59 100644 (file)
--- a/src/gdcmRLEFramesInfo.h
+++ b/src/gdcmRLEFramesInfo.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFramesInfo.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/30 17:30:57 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/01/31 04:15:33 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -49,7 +49,7 @@ public:
    void AddFrame(RLEFrame *frame);
 
    RLEFrame *GetFirstFrame();
-   RLEFrame *GetNexttFrame();
+   RLEFrame *GetNextFrame();
 
 private:
    typedef std::list<RLEFrame *> RLEFrameList;