X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.h;h=b6cb2c21aaca4e0eeffd75e079536ce33c4857d3;hb=a02866a66001f273faf0e96be8f7135e03105edf;hp=e67769cde3d89dddae4f47af9f46baebbb3936db;hpb=746c9ec7ec0fbe389b0894c80a8393ecd5472479;p=gdcm.git

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index e67769cd..b6cb2c21 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:30:58 $
-  Version:   $Revision: 1.78 $
+  Date:      $Date: 2004/07/17 22:45:40 $
+  Version:   $Revision: 1.81 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -98,13 +98,13 @@ 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);
@@ -146,23 +146,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,14 +161,16 @@ 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);
+ 
 protected:
    bool AnonymizeHeader();
    void GetImageOrientationPatient( float* iop );