X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=73590e8651a47fd6f776f9a6fa68d29c9e9cabba;hb=b49637c801a8f76fb1f9ffe37e7eb420e330441c;hp=643e407ec349c7577ce0a96bc61bf5a4e129af46;hpb=78862d87820021177071181631c6218db14b3fd4;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 643e407e..73590e86 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/21 14:01:50 $
-  Version:   $Revision: 1.112 $
+  Date:      $Date: 2005/10/25 14:52:34 $
+  Version:   $Revision: 1.118 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,16 +27,6 @@
 namespace gdcm 
 {
 
-
-typedef struct
-{
-   float x;
-   float y;
-   float z;
-} vector3D;
-
-typedef std::pair<float, float> Res;
-
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
@@ -108,10 +98,10 @@ enum ModalityType {
  */
 class GDCM_EXPORT File : public Document
 {
+   gdcmTypeMacro(File);
+
 public:
-   File();
-   GDCM_LEGACY(File( std::string const &filename ));
-   ~File();
+   static File *New() {return new File();}
 
    // Loading
    GDCM_LEGACY(bool Load( std::string const &filename ));
@@ -177,17 +167,17 @@ 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);
 
-   float TypeOrientation( );
-
 protected:
- 
+   File();
+   ~File();
+
    /// Store the RLE frames info obtained during parsing of pixels.
    RLEFramesInfo *RLEInfo;
    /// Store the JPEG fragments info obtained during parsing of pixels.
@@ -210,12 +200,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, float criterionNew, Res res);
-   float CalculLikelyhood2Vec(vector3D refA, vector3D refB, 
-                              vector3D ori1, vector3D ori2);
-   vector3D ProductVectorial(vector3D vec1, vector3D vec2);
 };
 } // end namespace gdcm