*FIX: gdcm/Makefile.am fix for generating ljpg medcon

[gdcm.git] / src / gdcmHeader.h

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index cf1918e6c0e300058725943656b0d929f76fe5f1..7a518912cd2023870761f5b75bd1f2b59cb6606a 100644 (file)
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -1,9 +1,8 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.35 2003/07/23 08:43:03 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.40 2003/10/21 12:19:43 jpr Exp $
 
 #ifndef GDCMHEADER_H
 #define GDCMHEADER_H
 
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmVR.h"
 #include "gdcmTS.h"
@@ -11,6 +10,7 @@
 #include "gdcmDictSet.h"
 #include "gdcmElValue.h"
 #include "gdcmElValSet.h"
+#include <map>
 
 typedef std::string VRKey;
 typedef std::string VRAtr;
@@ -40,12 +40,12 @@ private:
    /// the VR of the DICOM version3 public dictionary. 
    gdcmVR *dicom_vr;     // Not a class member for thread-safety reasons
    /// Pointer to global dictionary container
-   gdcmDictSet* Dicts;   // Not a class member for thread-safety reasons
+   gdcmDictSet *Dicts;   // Not a class member for thread-safety reasons
    /// Public dictionary used to parse this header
-   gdcmDict* RefPubDict;
+   gdcmDict *RefPubDict;
    /// Optional "shadow dictionary" (private elements) used to parse this
    /// header
-   gdcmDict* RefShaDict;
+   gdcmDict *RefShaDict;
    /// Pointer to the Transfert Syntax Hash Table which contains all
    /// the TS of the DICOM version3 public dictionary. 
    gdcmTS *dicom_ts;     // Not a class member for thread-safety reasons
@@ -190,6 +190,7 @@ public:
    int GetYSize(void);
    int GetZSize(void);
    int GetBitsStored(void);
+   int GetBitsAllocated(void);
    int GetSamplesPerPixel(void);
    
    int GetPlanarConfiguration(void);
@@ -197,15 +198,7 @@ public:
    int GetPixelSize(void);       
    std::string GetPixelType(void);  
    
-   float GetXSpacing(void);
-   float GetYSpacing(void);  
-   float GetZSpacing(void);  
-  
-   float GetXImagePosition(void);
-   float GetYImagePosition(void);
-   float GetZImagePosition(void);
-   
-   string GetTransferSyntaxName(void);
+   std::string GetTransferSyntaxName(void);
    int    GetLUTLength(void);
    int    GetLUTNbits(void);
    void * GetLUTRed(void);