X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJPEGFragment.cxx;h=02b7a071aacbe522f85899291ed3b3d86978ca1b;hb=713d0f3d28a6176fab6d57e031633061dc7354a7;hp=fa8f86d6ca75e83b0e9717bc69cc6032ac489daa;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git

diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx
index fa8f86d6..02b7a071 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/02/01 10:29:55 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2007/08/22 16:14:04 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,16 +19,16 @@
 #include "gdcmJPEGFragment.h"
 #include "gdcmDebug.h"
 
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 //-------------------------------------------------------------------------
 // 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
@@ -55,7 +55,7 @@ JPEGFragment::JPEGFragment()
  */
 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);
@@ -67,11 +67,13 @@ void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp,
    }
    else if ( nBits <= 12 )
    {
+       assert( nBits >= 8 );
       // JPEG Lossy : call to IJG 6b - 12 bits
       ReadJPEGFile12 ( fp, buffer, statesuspension);
    }
    else if ( nBits <= 16 )
    {
+       assert( nBits >= 12 );
       // JPEG Lossy : call to IJG 6b - 16 bits
       ReadJPEGFile16 ( fp, buffer, statesuspension);
       //gdcmAssertMacro( IsJPEGLossless );
@@ -99,7 +101,7 @@ void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp,
  * @param os     Stream to print to.
  * @param indent Indentation string to be prepended during printing.
  */
-void JPEGFragment::Print( std::ostream &os, std::string indent )
+void JPEGFragment::Print( std::ostream &os, std::string const &indent )
 {
    os << indent
       << "JPEG fragment: offset : " <<  Offset