X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmFile.h;h=8e6e51adab74897ae5a5e5839f0ab235e80cc5a5;hb=536e773e8f72c8e949831abf6496c348d5badf2d;hp=2675a0d7eb5aa38be045c8ceafa1add226c4f9e8;hpb=f88cd7e3127179d20920d54df75bff206be94a09;p=gdcm.git diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 2675a0d7..8e6e51ad 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2005/07/24 02:14:43 $ - Version: $Revision: 1.114 $ + Date: $Date: 2005/10/06 18:54:50 $ + Version: $Revision: 1.117 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,15 +27,6 @@ namespace gdcm { -typedef struct -{ - double x; - double y; - double z; -} vector3D; - -typedef std::pair Res; - class RLEFramesInfo; class JPEGFragmentsInfo; @@ -176,15 +167,13 @@ public: void AddAnonymizeElement (uint16_t group, uint16_t elem, std::string const &value); /// Clears the list of elements to be anonymized - void ClearAnonymizeList() { AnonymizeList.clear(); } + void ClearAnonymizeList() { UserAnonymizeList.clear(); } void AnonymizeNoLoad(); /// Replace patient's own information by info from the Anonymization list bool AnonymizeFile(); bool Write(std::string fileName, FileType filetype); - double TypeOrientation( ); - protected: /// Store the RLE frames info obtained during parsing of pixels. @@ -209,12 +198,9 @@ private: void ComputeJPEGFragmentInfo(); bool ReadTag(uint16_t, uint16_t); uint32_t ReadTagLength(uint16_t, uint16_t); - void ReadAndSkipEncapsulatedBasicOffsetTable(); + void ReadEncapsulatedBasicOffsetTable(); + uint32_t *BasicOffsetTableItemValue; - Res VerfCriterion(int typeCriterion, double criterionNew, Res const & res); - double CalculLikelyhood2Vec(vector3D const & refA, vector3D const & refB, - vector3D const & ori1, vector3D const & ori2); - vector3D ProductVectorial(vector3D const & vec1, vector3D const & vec2); }; } // end namespace gdcm