X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFrame.cxx;h=d22e21fd9af237285574dbcb5b470406d5e1d241;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=1fa42311aed0b7303deac16744828e7fbe864842;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git

diff --git a/src/gdcmRLEFrame.cxx b/src/gdcmRLEFrame.cxx
index 1fa42311..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/11/28 15:20:34 $
-  Version:   $Revision: 1.10 $
+  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
@@ -28,25 +28,25 @@ namespace gdcm
 // Public
 void RLEFrame::SetOffset(unsigned int id,long offset)
 {
-   gdcmStaticAssertMacro(id<15);
+   gdcmAssertMacro(id<15);
    Offset[id] = offset;
 }
 
 long RLEFrame::GetOffset(unsigned int id)
 {
-   gdcmStaticAssertMacro(id<15);
+   gdcmAssertMacro(id<15);
    return Offset[id];
 }
 
 void RLEFrame::SetLength(unsigned int id,long length)
 {
-   gdcmStaticAssertMacro(id<15);
+   gdcmAssertMacro(id<15);
    Length[id] = length;
 }
 
 long RLEFrame::GetLength(unsigned int id)
 {
-   gdcmStaticAssertMacro(id<15);
+   gdcmAssertMacro(id<15);
    return Length[id];
 }
 
@@ -119,7 +119,7 @@ bool RLEFrame::ReadAndDecompressRLEFragment( uint8_t *subRaw,
                                                                                 
       if ( numberOfReadBytes > fragmentSize )
       {
-         gdcmStaticWarningMacro( "Read more bytes (" << numberOfReadBytes
+         gdcmWarningMacro( "Read more bytes (" << numberOfReadBytes
                               << " ) than the segment size. (" 
                               << fragmentSize << ")" );
          return false;
@@ -141,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"