X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFramesInfo.h;h=9ea93c4434a21d1b15d9cd9d2aea4858fa44a579;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=c4f44ddbc06043707517ddd2fb9c4ae320389b72;hpb=906464b1c71b1b623f8202a693e75a358a5bd965;p=gdcm.git diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h index c4f44ddb..9ea93c44 100644 --- a/src/gdcmRLEFramesInfo.h +++ b/src/gdcmRLEFramesInfo.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFramesInfo.h,v $ Language: C++ - Date: $Date: 2006/02/16 20:06:15 $ - Version: $Revision: 1.21 $ + Date: $Date: 2007/09/17 12:16:01 $ + Version: $Revision: 1.25 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,28 +17,28 @@ =========================================================================*/ -#ifndef GDCMRLEFRAMESINFO_H -#define GDCMRLEFRAMESINFO_H +#ifndef _GDCMRLEFRAMESINFO_H_ +#define _GDCMRLEFRAMESINFO_H_ #include "gdcmRLEFrame.h" #include -namespace gdcm +namespace GDCM_NAME_SPACE { /** * \brief Utility class for gathering the informations of the collection - * of RLE frame[s] (see \ref RLEFrame) when handling + * of RLE frame[s] (see RLEFrame) when handling * "Encapsulated RLE Compressed Images" (see PS 3.5-2003 annex G). * Note: a classical image can be considered as the degenerated case * of a multiframe image. In this case the collection is limited * to a single individual frame. * The informations on each frame are obtained during the pixel parsing * of a gdcm::File (refer to - * \ref File::ComputeRLEInfo() ). + * File::ComputeRLEInfo() ). * They shall be used when (if necessary) decoding the frames. * - * This class is simply a stl list<> of \ref RLEFrame. + * This class is simply a stl list<> of RLEFrame. */ class GDCM_EXPORT RLEFramesInfo { @@ -49,9 +49,9 @@ private: ~RLEFramesInfo(); void Print( std::ostream &os = std::cout, std::string indent = "" ); bool DecompressRLEFile( std::ifstream *fp, uint8_t *subRaw, int xSize, - int ySize, int zSize, int bitsAllocated ); - bool ConvertRLE16BitsFromRLE8Bits( uint8_t *subRaw, int xSize, int ySize, - int numberOfFrames ); + int ySize, int zSize, int tSize, int bitsAllocated ); + bool ConvertRLE16BitsFromRLE8Bits( uint8_t *subRaw, int xSize, int ySize, + int tSize, int numberOfFrames); void AddFrame(RLEFrame *frame);