X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=27ff8e2b83384398ebb43b587b4f63467d724c31;hb=d1c68c2c2ae9fadf927053150f7fbc625a7c7366;hp=56f941b7b18ce9dfb0d84869613fd48293e4387f;hpb=4491b768d9529a24608e44d6ef77dc235d37dbb7;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 56f941b7..27ff8e2b 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/01/31 06:17:22 $ - Version: $Revision: 1.42 $ + Date: $Date: 2005/02/01 10:29:55 $ + Version: $Revision: 1.43 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,9 +30,9 @@ namespace gdcm { +//----------------------------------------------------------------------------- #define str2num(str, typeNum) *((typeNum *)(str)) - //----------------------------------------------------------------------------- // Constructor / Destructor PixelReadConvert::PixelReadConvert() @@ -47,6 +47,13 @@ PixelReadConvert::PixelReadConvert() LutBlueData =0; } +PixelReadConvert::~PixelReadConvert() +{ + Squeeze(); +} + +//----------------------------------------------------------------------------- +// Public void PixelReadConvert::Squeeze() { if ( RGB ) @@ -62,11 +69,6 @@ void PixelReadConvert::Squeeze() LutRGBA = 0; } -PixelReadConvert::~PixelReadConvert() -{ - Squeeze(); -} - void PixelReadConvert::AllocateRGB() { if ( RGB ) @@ -854,6 +856,14 @@ bool PixelReadConvert::BuildRGBImage() return true; } +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- +// Print /** * \brief Print self. * @param indent Indentation string to be prepended during printing. @@ -896,6 +906,7 @@ void PixelReadConvert::Print( std::ostream &os, std::string const & indent ) } } +//----------------------------------------------------------------------------- } // end namespace gdcm // NOTES on File internal calls