From: jpr Date: Fri, 18 Nov 2005 14:33:24 +0000 (+0000) Subject: RLEFrame RLEFramesInfo declare File as friend. X-Git-Tag: Version1.3~67 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ca9484d08ecc47106e93aca5dbf88a5eeff5d8e3;p=gdcm.git RLEFrame RLEFramesInfo declare File as friend. All their members are private, in order not to confuse users. --- diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h index cc1d40d7..c076cb57 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/09/02 07:10:03 $ - Version: $Revision: 1.16 $ + Date: $Date: 2005/11/18 14:33:24 $ + Version: $Revision: 1.17 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,7 +45,9 @@ namespace gdcm */ class GDCM_EXPORT RLEFrame { -public: +friend class File; +friend class RLEFramesInfo; +private: RLEFrame() { NumberOfFragments = 0; } void Print( std::ostream &os = std::cout, std::string indent = "" ); @@ -62,7 +64,7 @@ public: bool ReadAndDecompressRLEFragment( uint8_t *subRaw, long fragmentSize, long rawSegmentSize, std::ifstream *fp ); -private: +//private: unsigned int NumberOfFragments; long Offset[15]; long Length[15]; diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h index b5f60727..56724c2e 100644 --- a/src/gdcmRLEFramesInfo.h +++ b/src/gdcmRLEFramesInfo.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFramesInfo.h,v $ Language: C++ - Date: $Date: 2005/02/11 16:58:49 $ - Version: $Revision: 1.19 $ + Date: $Date: 2005/11/18 14:33:24 $ + 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 @@ -42,7 +42,10 @@ namespace gdcm */ class GDCM_EXPORT RLEFramesInfo { -public: +friend class PixelReadConvert; +friend class File; + +private: ~RLEFramesInfo(); void Print( std::ostream &os = std::cout, std::string indent = "" ); bool DecompressRLEFile( std::ifstream *fp, uint8_t *subRaw, int xSize, @@ -55,7 +58,7 @@ public: RLEFrame *GetFirstFrame(); RLEFrame *GetNextFrame(); -private: +//private:: typedef std::list RLEFrameList; RLEFrameList Frames;