X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.h;h=86866908f34f68c5ded235aab4d5862a13ba5657;hb=bd7bec4c367d671a9da358584e98a8ec29bb641e;hp=1eb3efc2b0cbbcf1b2426ecfc285bdeb2ebd537f;hpb=20e27d1b00a398f5b6b18a23a111e77262fa97e3;p=gdcm.git

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 1eb3efc2..86866908 100644
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2006/11/15 15:54:15 $
-  Version:   $Revision: 1.130 $
+  Date:      $Date: 2007/09/17 12:16:02 $
+  Version:   $Revision: 1.134 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,15 +16,15 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMFILE_H
-#define GDCMFILE_H
+#ifndef _GDCMFILE_H_
+#define _GDCMFILE_H_
 
 #include "gdcmDebug.h"
 #include "gdcmDocument.h"
 #include "gdcmTagKey.h"
 
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 
 class RLEFramesInfo;
@@ -121,6 +121,7 @@ public:
    int GetZSize();
    int GetTSize(); // unnormalized in DICOM V3
 
+   bool GetSpacing(float &xspacing, float &yspacing, float &zspacing);
    float GetXSpacing();
    float GetYSpacing();
    float GetZSpacing();
@@ -128,7 +129,7 @@ public:
    float GetXOrigin();
    float GetYOrigin();
    float GetZOrigin();
-   
+
    float GetXCosineOnX();
    float GetXCosineOnY();  
    float GetXCosineOnZ();
@@ -156,15 +157,16 @@ public:
    int GetLUTNbits();
 
    // For rescaling graylevel:
-   float GetRescaleIntercept();
-   float GetRescaleSlope();
+   bool GetRescaleSlopeIntercept(double &slope, double &intercept);   
+   double GetRescaleIntercept();
+   double GetRescaleSlope();
 
    int GetNumberOfScalarComponents();
    int GetNumberOfScalarComponentsRaw();
 
-   /// Accessor to \ref File::GrPixel
+   /// Accessor to  File::GrPixel
    uint16_t GetGrPixel()  { return GrPixel; }
-   /// Accessor to \ref File::NumPixel
+   /// Accessor to  File::NumPixel
    uint16_t GetNumPixel() { return NumPixel; }
 
    size_t GetPixelOffset();