X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFrame.cxx;h=d22e21fd9af237285574dbcb5b470406d5e1d241;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=99a7f7187fb5c568a918d59eaa394a2a6d885725;hpb=344736f50f507aa60d8fc6f6645fe5259a26b264;p=gdcm.git diff --git a/src/gdcmRLEFrame.cxx b/src/gdcmRLEFrame.cxx index 99a7f718..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 13:00:16 $ - Version: $Revision: 1.6 $ + 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 @@ -85,7 +85,6 @@ bool RLEFrame::ReadAndDecompressRLEFragment( uint8_t *subRaw, long numberOfOutputBytes = 0; long numberOfReadBytes = 0; - while( numberOfOutputBytes < rawSegmentSize ) { fp->read( (char*)&count, 1 ); @@ -120,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; } } @@ -140,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"