From: regrain Date: Mon, 28 Nov 2005 16:50:32 +0000 (+0000) Subject: * Remove all gdcmStaticXxxMacro with Xxx : Debug, Warning, Error or Assert when... X-Git-Tag: Version1.3~23 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6d79b5e185867ef00629f1ccb279c32daa6357d2;p=gdcm.git * Remove all gdcmStaticXxxMacro with Xxx : Debug, Warning, Error or Assert when the method isn't static -- BeNours --- diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx index a742c86b..31afc8e7 100644 --- a/src/gdcmDebug.cxx +++ b/src/gdcmDebug.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDebug.cxx,v $ Language: C++ - Date: $Date: 2005/11/28 16:31:22 $ - Version: $Revision: 1.28 $ + Date: $Date: 2005/11/28 16:50:32 $ + Version: $Revision: 1.29 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -121,7 +121,8 @@ std::ostream &Debug::GetOutput () void Debug::SendToOutput(unsigned int type,std::string const &msg,const Base *object) { bool executed=false; - executed=CommandManager::ExecuteCommandConst(object,type,msg); + if( type != CMD_DEBUG && type != CMD_ASSERT ) + executed=CommandManager::ExecuteCommandConst(object,type,msg); if(!executed) GetOutput() << Command::GetCommandAsString(type) << ": " << msg; diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index 1ee1c0db..33d22690 100644 --- a/src/gdcmDebug.h +++ b/src/gdcmDebug.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDebug.h,v $ Language: C++ - Date: $Date: 2005/11/28 16:31:23 $ - Version: $Revision: 1.50 $ + Date: $Date: 2005/11/28 16:50:32 $ + Version: $Revision: 1.51 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -162,7 +162,7 @@ private: } \ } #define gdcmDebugMacro(msg) \ - gdcmDebugBodyMacro(this,msg) + gdcmDebugBodyMacro(NULL,msg) #define gdcmStaticDebugMacro(msg) \ gdcmDebugBodyMacro(NULL,msg) #endif //NDEBUG diff --git a/src/gdcmJPEGFragment.cxx b/src/gdcmJPEGFragment.cxx index 5aec9aa3..2dc8c121 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/11/28 15:20:33 $ - Version: $Revision: 1.15 $ + Date: $Date: 2005/11/28 16:50:32 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -82,7 +82,7 @@ void JPEGFragment::DecompressJPEGFramesFromFile(std::ifstream *fp, // NOT the compression method // other JPEG lossy not supported - gdcmStaticErrorMacro( "Unknown jpeg lossy compression "); + gdcmErrorMacro( "Unknown jpeg lossy compression "); } } diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h index fa99e09d..7c095ce3 100644 --- a/src/gdcmJPEGFragment.h +++ b/src/gdcmJPEGFragment.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragment.h,v $ Language: C++ - Date: $Date: 2005/09/02 07:10:03 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/11/28 16:50:32 $ + 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 @@ -20,7 +20,7 @@ #ifndef GDCMJPEGFRAGMENT_H #define GDCMJPEGFRAGMENT_H -#include "gdcmCommon.h" +#include "gdcmBase.h" #include #include @@ -39,7 +39,7 @@ namespace gdcm * a given Document as they are JPEG fragments and they are * collected in a \ref JPEGFragmentsInfo ) */ -class GDCM_EXPORT JPEGFragment + class GDCM_EXPORT JPEGFragment : public Base { public: JPEGFragment(); diff --git a/src/gdcmJPEGFragmentsInfo.cxx b/src/gdcmJPEGFragmentsInfo.cxx index 212dee6a..ccf920b2 100644 --- a/src/gdcmJPEGFragmentsInfo.cxx +++ b/src/gdcmJPEGFragmentsInfo.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragmentsInfo.cxx,v $ Language: C++ - Date: $Date: 2005/11/28 15:20:33 $ - Version: $Revision: 1.19 $ + Date: $Date: 2005/11/28 16:50:32 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -78,7 +78,7 @@ JPEGFragment *JPEGFragmentsInfo::GetFirstFragment() JPEGFragment *JPEGFragmentsInfo::GetNextFragment() { - gdcmStaticAssertMacro (ItFragments != Fragments.end()); + gdcmAssertMacro (ItFragments != Fragments.end()); ++ItFragments; if (ItFragments != Fragments.end()) diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx index 9b663f9f..328eebe2 100644 --- a/src/gdcmJpeg.cxx +++ b/src/gdcmJpeg.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJpeg.cxx,v $ Language: C++ - Date: $Date: 2005/11/28 15:20:33 $ - Version: $Revision: 1.52 $ + Date: $Date: 2005/11/28 16:50:32 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -268,7 +268,7 @@ bool JPEGFragment::ReadJPEGFile (std::ifstream *fp, void *image_buffer, int &sta // If we get here, the JPEG code has signaled an error. // We need to clean up the JPEG object, close the input file, and return. - gdcmStaticErrorMacro( "Serious Problem !" ); + gdcmErrorMacro( "Serious Problem !" ); jpeg_destroy_decompress(&cinfo); return 0; } diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 02ee4dd0..38df3566 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2005/11/28 15:30:04 $ - Version: $Revision: 1.104 $ + Date: $Date: 2005/11/28 16:50:32 $ + Version: $Revision: 1.105 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -157,7 +157,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) if( IsJPEG2000 = Global::GetTS()->IsJPEG2000(ts) ) break; if( IsMPEG = Global::GetTS()->IsMPEG(ts) ) break; if( IsJPEGLS = Global::GetTS()->IsJPEGLS(ts) ) break; - gdcmStaticWarningMacro("Unexpected Transfer Syntax :[" << ts << "]"); + gdcmWarningMacro("Unexpected Transfer Syntax :[" << ts << "]"); break; } } @@ -207,7 +207,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) LutRedData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1201 ); if ( ! LutRedData ) { - gdcmStaticWarningMacro("Unable to read Red Palette Color Lookup Table data"); + gdcmWarningMacro("Unable to read Red Palette Color Lookup Table data"); } // //// Green round: @@ -215,7 +215,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) LutGreenData = (uint8_t*)file->GetEntryBinArea(0x0028, 0x1202 ); if ( ! LutGreenData) { - gdcmStaticWarningMacro("Unable to read Green Palette Color Lookup Table data"); + gdcmWarningMacro("Unable to read Green Palette Color Lookup Table data"); } // //// Blue round: @@ -223,7 +223,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) LutBlueData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1203 ); if ( ! LutBlueData ) { - gdcmStaticWarningMacro("Unable to read Blue Palette Color Lookup Table data"); + gdcmWarningMacro("Unable to read Blue Palette Color Lookup Table data"); } } FileInternal = file; @@ -243,14 +243,14 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) //// First stage: get our hands on the Pixel Data. if ( !fp ) { - gdcmStaticWarningMacro( "Unavailable file pointer." ); + gdcmWarningMacro( "Unavailable file pointer." ); return false; } fp->seekg( PixelOffset, std::ios::beg ); if ( fp->fail() || fp->eof() ) { - gdcmStaticWarningMacro( "Unable to find PixelOffset in file." ); + gdcmWarningMacro( "Unable to find PixelOffset in file." ); return false; } @@ -270,7 +270,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) // variable). But RawSize is the right size of the image ! if ( PixelDataLength != RawSize ) { - gdcmStaticWarningMacro( "Mismatch between PixelReadConvert : " + gdcmWarningMacro( "Mismatch between PixelReadConvert : " << PixelDataLength << " and RawSize : " << RawSize ); } if ( PixelDataLength > RawSize ) @@ -284,7 +284,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) if ( fp->fail() || fp->eof()) { - gdcmStaticWarningMacro( "Reading of Raw pixel data failed." ); + gdcmWarningMacro( "Reading of Raw pixel data failed." ); return false; } } @@ -293,13 +293,13 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) if ( ! RLEInfo->DecompressRLEFile ( fp, Raw, XSize, YSize, ZSize, BitsAllocated ) ) { - gdcmStaticWarningMacro( "RLE decompressor failed." ); + gdcmWarningMacro( "RLE decompressor failed." ); return false; } } else if ( IsMPEG ) { - //gdcmStaticWarningMacro( "Sorry, MPEG not yet taken into account" ); + //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" ); //return false; // fp has already been seek to start of mpeg //ReadMPEGFile(fp, (char*)Raw, PixelDataLength); @@ -310,7 +310,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) // Default case concerns JPEG family if ( ! ReadAndDecompressJPEGFile( fp ) ) { - gdcmStaticWarningMacro( "JPEG decompressor ( ReadAndDecompressJPEGFile()" + gdcmWarningMacro( "JPEG decompressor ( ReadAndDecompressJPEGFile()" << " method ) failed." ); return false; } @@ -368,7 +368,7 @@ bool PixelReadConvert::BuildRGBImage() return false; } - gdcmStaticDebugMacro( "--> BuildRGBImage" ); + gdcmDebugMacro( "--> BuildRGBImage" ); // Build RGB Pixels AllocateRGB(); @@ -477,7 +477,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) inputlength += jpegfrag->GetLength(); jpegfrag = JPEGInfo->GetNextFragment(); } - gdcmStaticAssertMacro( inputlength != 0); + gdcmAssertMacro( inputlength != 0); uint8_t *inputdata = new uint8_t[inputlength]; char *pinputdata = (char*)inputdata; jpegfrag = JPEGInfo->GetFirstFragment(); @@ -495,7 +495,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) return true; } // wow what happen, must be an error - gdcmStaticWarningMacro( "gdcm_read_JPEG2000_file() failed "); + gdcmWarningMacro( "gdcm_read_JPEG2000_file() failed "); return false; } else if ( IsJPEGLS ) @@ -519,7 +519,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) inputlength += jpegfrag->GetLength(); jpegfrag = JPEGInfo->GetNextFragment(); } - gdcmStaticAssertMacro( inputlength != 0); + gdcmAssertMacro( inputlength != 0); uint8_t *inputdata = new uint8_t[inputlength]; char *pinputdata = (char*)inputdata; jpegfrag = JPEGInfo->GetFirstFragment(); @@ -539,7 +539,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) delete[] inputdata; #endif - gdcmStaticWarningMacro( "Sorry, JPEG-LS not yet taken into account" ); + gdcmWarningMacro( "Sorry, JPEG-LS not yet taken into account" ); fp->seekg( JPEGInfo->GetFirstFragment()->GetOffset(), std::ios::beg); // if ( ! gdcm_read_JPEGLS_file( fp,Raw ) ) return false; @@ -598,7 +598,7 @@ void PixelReadConvert::BuildLUTRGBA() || LutGreenDescriptor == GDCM_UNFOUND || LutBlueDescriptor == GDCM_UNFOUND ) { - gdcmStaticWarningMacro( "(At least) a LUT Descriptor is missing" ); + gdcmWarningMacro( "(At least) a LUT Descriptor is missing" ); return; } @@ -614,7 +614,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthR, &debR, &nbitsR ); if ( nbRead != 3 ) { - gdcmStaticWarningMacro( "Wrong Red LUT descriptor" ); + gdcmWarningMacro( "Wrong Red LUT descriptor" ); } int lengthG; // Green LUT length in Bytes int debG; // Subscript of the first Lut Value @@ -625,7 +625,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthG, &debG, &nbitsG ); if ( nbRead != 3 ) { - gdcmStaticWarningMacro( "Wrong Green LUT descriptor" ); + gdcmWarningMacro( "Wrong Green LUT descriptor" ); } int lengthB; // Blue LUT length in Bytes @@ -636,15 +636,15 @@ void PixelReadConvert::BuildLUTRGBA() &lengthB, &debB, &nbitsB ); if ( nbRead != 3 ) { - gdcmStaticWarningMacro( "Wrong Blue LUT descriptor" ); + gdcmWarningMacro( "Wrong Blue LUT descriptor" ); } - gdcmStaticDebugMacro(" lengthR " << lengthR << " debR " - << debR << " nbitsR " << nbitsR); - gdcmStaticDebugMacro(" lengthG " << lengthG << " debG " - << debG << " nbitsG " << nbitsG); - gdcmStaticDebugMacro(" lengthB " << lengthB << " debB " - << debB << " nbitsB " << nbitsB); + gdcmDebugMacro(" lengthR " << lengthR << " debR " + << debR << " nbitsR " << nbitsR); + gdcmDebugMacro(" lengthG " << lengthG << " debG " + << debG << " nbitsG " << nbitsG); + gdcmDebugMacro(" lengthB " << lengthB << " debB " + << debB << " nbitsB " << nbitsB); if ( !lengthR ) // if = 2^16, this shall be 0 see : CP-143 lengthR=65536; @@ -657,7 +657,7 @@ void PixelReadConvert::BuildLUTRGBA() if ( ( ! LutRedData ) || ( ! LutGreenData ) || ( ! LutBlueData ) ) { - gdcmStaticWarningMacro( "(At least) a LUT is missing" ); + gdcmWarningMacro( "(At least) a LUT is missing" ); return; } @@ -735,7 +735,7 @@ void PixelReadConvert::BuildLUTRGBA() // with 65536 entries LUT ?!? // Still looking for accurate info on the web :-( - gdcmStaticWarningMacro( "Sorry Palette Color Lookup Tables not yet dealt with" + gdcmWarningMacro( "Sorry Palette Color Lookup Tables not yet dealt with" << " for 16 Bits Per Pixel images" ); // forge the 4 * 16 Bits Red/Green/Blue/Alpha LUT @@ -831,7 +831,7 @@ void PixelReadConvert::ConvertSwapZone() int tempSwapCode = SwapCode; if ( IsPrivateGETransferSyntax ) { - gdcmStaticWarningMacro(" IsPrivateGETransferSyntax found; turn the SwapCode"); + gdcmWarningMacro(" IsPrivateGETransferSyntax found; turn the SwapCode"); // PrivateGETransferSyntax only exists for 'true' Dicom images // we assume there is no 'exotic' 32 bits endianess! if (SwapCode == 1234) @@ -860,7 +860,7 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - gdcmStaticWarningMacro("SwapCode value (16 bits) not allowed." + gdcmWarningMacro("SwapCode value (16 bits) not allowed." << tempSwapCode); } } @@ -906,7 +906,7 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - gdcmStaticWarningMacro("SwapCode value (32 bits) not allowed." << tempSwapCode ); + gdcmWarningMacro("SwapCode value (32 bits) not allowed." << tempSwapCode ); } } } @@ -1096,7 +1096,7 @@ bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) } else { - gdcmStaticWarningMacro("Weird image (BitsAllocated !=8, 12, 16, 32)"); + gdcmWarningMacro("Weird image (BitsAllocated !=8, 12, 16, 32)"); throw FormatError( "Weird image !?" ); } } @@ -1109,7 +1109,7 @@ bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) */ void PixelReadConvert::ConvertRGBPlanesToRGBPixels() { - gdcmStaticWarningMacro("--> ConvertRGBPlanesToRGBPixels"); + gdcmWarningMacro("--> ConvertRGBPlanesToRGBPixels"); uint8_t *localRaw = Raw; uint8_t *copyRaw = new uint8_t[ RawSize ]; @@ -1145,7 +1145,7 @@ void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels() // On such images, RLE achieves a compression ratio that is much better // than the compression ratio on an equivalent RGB image. - gdcmStaticWarningMacro("--> ConvertYcBcRPlanesToRGBPixels"); + gdcmWarningMacro("--> ConvertYcBcRPlanesToRGBPixels"); uint8_t *localRaw = Raw; uint8_t *copyRaw = new uint8_t[ RawSize ]; @@ -1245,13 +1245,13 @@ void PixelReadConvert::ConvertHandleColor() // - [Planar 1] AND [Photo C] handled with ConvertYcBcRPlanesToRGBPixels() // - [Planar 2] OR [Photo D] requires LUT intervention. - gdcmStaticDebugMacro("--> ConvertHandleColor " + gdcmDebugMacro("--> ConvertHandleColor " << "Planar Configuration " << PlanarConfiguration ); if ( ! IsRawRGB() ) { // [Planar 2] OR [Photo D]: LUT intervention done outside - gdcmStaticDebugMacro("--> RawRGB : LUT intervention done outside"); + gdcmDebugMacro("--> RawRGB : LUT intervention done outside"); return; } @@ -1260,13 +1260,13 @@ void PixelReadConvert::ConvertHandleColor() if ( IsYBRFull ) { // [Planar 1] AND [Photo C] (remember YBR_FULL_422 acts as RGB) - gdcmStaticDebugMacro("--> YBRFull"); + gdcmDebugMacro("--> YBRFull"); ConvertYcBcRPlanesToRGBPixels(); } else { // [Planar 1] AND [Photo C] - gdcmStaticDebugMacro("--> YBRFull"); + gdcmDebugMacro("--> YBRFull"); ConvertRGBPlanesToRGBPixels(); } return; @@ -1277,7 +1277,7 @@ void PixelReadConvert::ConvertHandleColor() if (IsRLELossless) { - gdcmStaticDebugMacro("--> RLE Lossless"); + gdcmDebugMacro("--> RLE Lossless"); ConvertRGBPlanesToRGBPixels(); } @@ -1352,7 +1352,7 @@ void PixelReadConvert::Print( std::ostream &os, std::string const &indent ) } else { - gdcmStaticWarningMacro("Set as RLE file but NO RLEinfo present."); + gdcmWarningMacro("Set as RLE file but NO RLEinfo present."); } } @@ -1364,7 +1364,7 @@ void PixelReadConvert::Print( std::ostream &os, std::string const &indent ) } else { - gdcmStaticWarningMacro("Set as JPEG file but NO JPEGinfo present."); + gdcmWarningMacro("Set as JPEG file but NO JPEGinfo present."); } } } diff --git a/src/gdcmRLEFrame.cxx b/src/gdcmRLEFrame.cxx index 1fa42311..de4e50d0 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: 2005/11/28 16:50:33 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -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; diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h index c076cb57..a4af1a86 100644 --- a/src/gdcmRLEFrame.h +++ b/src/gdcmRLEFrame.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFrame.h,v $ Language: C++ - Date: $Date: 2005/11/18 14:33:24 $ - Version: $Revision: 1.17 $ + Date: $Date: 2005/11/28 16:50:33 $ + Version: $Revision: 1.18 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,7 +20,7 @@ #ifndef GDCMRLEFRAME_H #define GDCMRLEFRAME_H -#include "gdcmCommon.h" +#include "gdcmBase.h" #include #include @@ -43,7 +43,7 @@ namespace gdcm * - the offsets of each segment of the frame, * - the (corresponding) lengths of each segment of the frame. */ -class GDCM_EXPORT RLEFrame + class GDCM_EXPORT RLEFrame : public Base { friend class File; friend class RLEFramesInfo; diff --git a/src/gdcmRLEFramesInfo.cxx b/src/gdcmRLEFramesInfo.cxx index c5ce8d88..6c6d3c3e 100644 --- a/src/gdcmRLEFramesInfo.cxx +++ b/src/gdcmRLEFramesInfo.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFramesInfo.cxx,v $ Language: C++ - Date: $Date: 2005/11/28 15:20:34 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/11/28 16:50:33 $ + 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 @@ -50,7 +50,7 @@ RLEFrame *RLEFramesInfo::GetFirstFrame() RLEFrame *RLEFramesInfo::GetNextFrame() { - gdcmStaticAssertMacro (ItFrames != Frames.end()); + gdcmAssertMacro (ItFrames != Frames.end()); ++ItFrames; if (ItFrames != Frames.end()) diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index d351e406..a89ca687 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2005/11/28 15:20:34 $ - Version: $Revision: 1.177 $ + Date: $Date: 2005/11/28 16:50:33 $ + Version: $Revision: 1.178 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -453,7 +453,7 @@ bool Util::IsCurrentProcessorBigEndian() std::string Util::DicomString(const char *s, size_t l) { std::string r(s, s+l); - gdcmStaticAssertMacro( !(r.size() % 2) ); // == basically 'l' is even + gdcmAssertMacro( !(r.size() % 2) ); // == basically 'l' is even return r; } @@ -476,7 +476,7 @@ std::string Util::DicomString(const char *s) l++; } std::string r(s, s+l); - gdcmStaticAssertMacro( !(r.size() % 2) ); + gdcmAssertMacro( !(r.size() % 2) ); return r; } @@ -528,7 +528,7 @@ bool Util::CompareDicomString(const std::string &s1, const char *s2, int op) case GDCM_LESSOREQUAL : return s1_even <= s2_even; default : - gdcmStaticDebugMacro(" Wrong operator : " << op); + gdcmDebugMacro(" Wrong operator : " << op); return false; } }