X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFrame.cxx;h=d22e21fd9af237285574dbcb5b470406d5e1d241;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=0b17ce09dbedfa23e8e4943f22156a9d8e1b75ce;hpb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;p=gdcm.git

diff --git a/src/gdcmRLEFrame.cxx b/src/gdcmRLEFrame.cxx
index 0b17ce09..d22e21fd 100644
--- a/src/gdcmRLEFrame.cxx
+++ b/src/gdcmRLEFrame.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLEFrame.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/01 10:29:56 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2007/05/23 14:18:11 $
+  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
@@ -19,7 +19,7 @@
 #include "gdcmRLEFrame.h"
 #include "gdcmDebug.h"
                                                                                 
-namespace gdcm
+namespace GDCM_NAME_SPACE
 {
 //-------------------------------------------------------------------------
 // Constructor / Destructor
@@ -70,11 +70,9 @@ uint8_t *RLEFrame::ReadAndDecompressRLEFrame( uint8_t *subRaw,
 /**
  * \brief Implementation of the RLE decoding algorithm for decompressing
  *        a RLE fragment. [refer to PS 3.5-2003, section G.3.2 p 86]
- * @param subRaw Sub region of \ref Raw where the decoded fragment
- *        should be placed.
+ * @param subRaw Sub region where the decoded fragment should be placed.
  * @param fragmentSize The length of the binary fragment as found on the disk.
- * @param RawSegmentSize The expected length of the fragment ONCE
- *        Raw.
+ * @param rawSegmentSize The expected length of the fragment ONCE Raw.
  * @param fp File Pointer: on entry the position should be the one of
  *        the fragment to be decoded.
  */
@@ -87,7 +85,6 @@ bool RLEFrame::ReadAndDecompressRLEFragment( uint8_t *subRaw,
    long numberOfOutputBytes = 0;
    long numberOfReadBytes = 0;
 
-
    while( numberOfOutputBytes < rawSegmentSize )
    {
       fp->read( (char*)&count, 1 );
@@ -122,7 +119,9 @@ bool RLEFrame::ReadAndDecompressRLEFragment( uint8_t *subRaw,
                                                                                 
       if ( numberOfReadBytes > fragmentSize )
       {
-         gdcmVerboseMacro( "Read more bytes than the segment size.");
+         gdcmWarningMacro( "Read more bytes (" << numberOfReadBytes
+                              << " ) than the segment size. (" 
+                              << fragmentSize << ")" );
          return false;
       }
    }
@@ -142,7 +141,7 @@ bool RLEFrame::ReadAndDecompressRLEFragment( uint8_t *subRaw,
  * @param indent Indentation string to be prepended during printing.
  * @param os     Stream to print to.
  */
-void RLEFrame::Print( std::ostream &os, std::string indent )
+void RLEFrame::Print( std::ostream &os, std::string const &indent )
 {
    os << indent
       << "--- fragments"