COMP: Too bad gcc3.3 on APPLE does not supported deprecated attribute on ctor......

[gdcm.git] / src / gdcmFile.h

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 0e937c772f6ffbba8c38240a6f281dba0f09196c..9062a1c8a203033fa9f8aef5854ff03972029ed4 100644 (file)
--- 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/20 13:31:01 $
-  Version:   $Revision: 1.111 $
+  Date:      $Date: 2005/07/24 00:24:46 $
+  Version:   $Revision: 1.113 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,8 +22,21 @@
 #include "gdcmDebug.h"
 #include "gdcmDocument.h"
 
+
+
 namespace gdcm 
 {
+
+
+typedef struct
+{
+   float x;
+   float y;
+   float z;
+} vector3D;
+
+typedef std::pair<float, float> Res;
+
 class RLEFramesInfo;
 class JPEGFragmentsInfo;
 
@@ -122,7 +135,7 @@ public:
    float GetYOrigin();
    float GetZOrigin();
 
-   void GetImageOrientationPatient( float iop[6] );
+   bool GetImageOrientationPatient( float iop[6] );
 
    int GetBitsStored();
    int GetBitsAllocated();
@@ -171,6 +184,8 @@ public:
 
    bool Write(std::string fileName, FileType filetype);
 
+   float TypeOrientation( );
+
 protected:
  
    /// Store the RLE frames info obtained during parsing of pixels.
@@ -197,6 +212,10 @@ private:
    uint32_t ReadTagLength(uint16_t, uint16_t);
    void ReadAndSkipEncapsulatedBasicOffsetTable();
 
+   Res VerfCriterion(int typeCriterion, float criterionNew, Res res);
+   float CalculLikelyhood2Vec(vector3D const & refA, vector3D const & refB, 
+                              vector3D const & ori1, vector3D const & ori2);
+   vector3D ProductVectorial(vector3D const & vec1, vector3D const & vec2);
 };
 } // end namespace gdcm