X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.h;h=b521ed312d2e6665c4675ccde06133e05c84fc89;hb=f6dbab059809959b586408f89330264a03cfe656;hp=2b01cc81b1405e769e67d09d45eb13ea5d5381a4;hpb=0d8ca63a1a2c1a61c2e2b92526ba81c9885702ba;p=gdcm.git

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index 2b01cc81..b521ed31 100644
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmHeader.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/28 09:51:02 $
-  Version:   $Revision: 1.79 $
+  Date:      $Date: 2004/08/02 16:42:14 $
+  Version:   $Revision: 1.86 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -98,20 +98,17 @@ protected:
    /// make things easier the parser shall store the proper value in
    /// NumPixel to provide a unique access facility. See also the constructor
    /// \ref gdcmHeader::gdcmHeader
-   guint16 NumPixel;
+   uint16_t NumPixel;
    /// \brief In some cases (e.g. for some ACR-NEMA images) the header entry for
    /// the group of pixels is *not* found at 0x7fe0. In order to
    /// make things easier the parser shall store the proper value in
    /// GrPixel to provide a unique access facility. See also the constructor
    /// \ref gdcmHeader::gdcmHeader
-   guint16 GrPixel;
+   uint16_t GrPixel;
 
 public:
-   gdcmHeader(bool exception_on_error = false);
-   gdcmHeader(std::string const & filename, 
-              bool  exception_on_error = false, 
-              bool  enable_sequences   = false,
-              bool  skip_shadow        = false);
+   gdcmHeader();
+   gdcmHeader( std::string const & filename );
  
    virtual ~gdcmHeader();
 
@@ -146,23 +143,9 @@ public:
    int GetNumberOfScalarComponents();
    int GetNumberOfScalarComponentsRaw();
 
-   // This is usefull for strategy of ordering study / series
-   // Marking them as deprecated since I believe this is achieve in the 
-   // gdcmDocument operator< 
-   //std::string GetStudyUID();
-   //std::string GetSeriesUID();
-   //std::string GetClassUID();
-   //std::string GetInstanceUID();
-
    int GetImageNumber();
    ModalityType GetModality();
 
-   /**
-    * change GetXImagePosition -> GetXOrigin in order not to confuse reader
-    * -# GetXOrigin can return default value (=0) if it was not ImagePosition
-    * -# Image Position is different in dicomV3 <> ACR NEMA -> better use generic
-    * name
-    */
    float GetXOrigin();
    float GetYOrigin();
    float GetZOrigin();
@@ -175,19 +158,19 @@ public:
    std::string GetTransfertSyntaxName();
 
    /// Accessor to \ref gdcmHeader::GrPixel
-   guint16 GetGrPixel()  {return GrPixel;}
+   uint16_t GetGrPixel()  { return GrPixel; }
    
    /// Accessor to \ref gdcmHeader::NumPixel
-   guint16 GetNumPixel() {return NumPixel;}
+   uint16_t GetNumPixel() { return NumPixel; }
 
    /// Read (used in gdcmFile)
    void SetImageDataSize(size_t expectedSize);
 
-   void gdcmHeader::Write(FILE* fp,FileType filetype);
+   void Write(FILE* fp, FileType filetype);
  
 protected:
    bool AnonymizeHeader();
-   void GetImageOrientationPatient( float* iop );
+   void GetImageOrientationPatient( float iop[6] );
 
 private:
   friend class gdcmSerieHeader;