X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.h;h=c824a342cbebd8c089af1af819f1c29659885298;hb=0d8ca63a1a2c1a61c2e2b92526ba81c9885702ba;hp=5d042c8e39299494e338ea9d8c9b173fa1ebfd77;hpb=19f72d139faa0f6a03f4e4a33be4c6b3e70b18b7;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 5d042c8e..c824a342 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2004/06/23 03:36:24 $ - Version: $Revision: 1.34 $ + Date: $Date: 2004/06/26 04:09:33 $ + Version: $Revision: 1.36 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -38,9 +38,9 @@ public: bool skip_shadow = false); virtual ~gdcmFile(); - - /// \brief returns the gdcmHeader *Header - inline gdcmHeader *GetHeader() { return Header;}; + + /// \brief returns the gdcmHeader *Header + inline gdcmHeader *GetHeader() { return Header; } // For promotion (performs a deepcopy of pointed header object) // TODO Swig gdcmFile(gdcmHeader* header); @@ -82,15 +82,16 @@ public: bool WriteDcmExplVR(std::string const & fileName); bool WriteAcr (std::string const & fileName); - // Body in file gdcmParse.cxx + // Don't look any longer for the code : + // It's in file gdcmParsePixels.cxx bool ParsePixelData(); inline virtual bool SetEntryByNumber(std::string const & content, guint16 group, guint16 element) - { GetHeader()->SetEntryByNumber(content,group,element); - return true; //default behavior ? - } - + { + GetHeader()->SetEntryByNumber(content,group,element); + return true; //default behavior ? + } protected: bool WriteBase(std::string const & FileName, FileType type); @@ -126,11 +127,11 @@ private: void* PixelData; /// \brief Area length to receive the pixels - size_t lgrTotaleRaw; + size_t ImageDataSizeRaw; /// \brief Area length to receive the RGB pixels /// from Grey Plane + Palette Color - size_t lgrTotale; + size_t ImageDataSize; /// \brief ==1 if GetImageDataRaw was used /// ==0 if GetImageData was used @@ -139,9 +140,6 @@ private: /// wether already parsed int Parsed; - - /// To avoid file overwrite - std::string OrigFileName; }; //-----------------------------------------------------------------------------