X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJPEGFragment.cxx;h=8c82b1d88f5d1c072e94b9b533a5c64247f6b67c;hb=14922bc6265c1a1e183e1643f70fa57c413b5d99;hp=e3569967180264d0184d685be5bddf91c9556228;hpb=1dd2c40c0da9098b444ad53b0e3c23da808997fa;p=gdcm.git

diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx
index e3569967..8c82b1d8 100644
--- 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/02/04 16:51:36 $
+  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
@@ -21,15 +21,17 @@
 
 namespace gdcm
 {
-
+//-------------------------------------------------------------------------
 // For JPEG 2000, body in file gdcmJpeg2000.cxx
 // Not yet made
-bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* image_buffer);
+bool gdcm_read_JPEG2000_file (std::ifstream *fp, void *image_buffer);
 
 // For JPEG-LS, body in file gdcmJpegLS.cxx
 // Not yet made
-bool gdcm_read_JPEGLS_file (std::ifstream* fp, void* image_buffer);
+bool gdcm_read_JPEGLS_file (std::ifstream *fp, void *image_buffer);
 
+//-------------------------------------------------------------------------
+// Constructor / Destructor
 /**
  * \brief Default constructor.
  */
@@ -42,19 +44,8 @@ JPEGFragment::JPEGFragment()
 
 }
 
-/**
- * \brief        Print self.
- * @param os     Stream to print to.
- * @param indent Indentation string to be prepended during printing.
- */
-void JPEGFragment::Print( std::ostream &os, std::string indent )
-{
-   os << indent
-      << "JPEG fragment: offset : " <<  Offset
-      << "   length : " <<  Length
-      << std::endl;
-}
-
+//-----------------------------------------------------------------------------
+// Public
 /**
  * \brief Decompress 8bits JPEG Fragment
  * @param fp ifstream to write to
@@ -64,7 +55,7 @@ void JPEGFragment::Print( std::ostream &os, std::string indent )
  */
 void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp,
                                                 uint8_t *buffer, int nBits, 
-                                                int & statesuspension)
+                                                int &statesuspension)
 {
    // First thing need to reset file to proper position:
    fp->seekg( Offset, std::ios::beg);
@@ -76,12 +67,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 );
    }
@@ -95,5 +86,27 @@ void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp,
    }
 }
 
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief        Print self.
+ * @param os     Stream to print to.
+ * @param indent Indentation string to be prepended during printing.
+ */
+void JPEGFragment::Print( std::ostream &os, std::string indent )
+{
+   os << indent
+      << "JPEG fragment: offset : " <<  Offset
+      << "   length : " <<  Length
+      << std::endl;
+}
+
+//-----------------------------------------------------------------------------
 } // end namespace gdcm