Temporary (?) uncomment of method gdcmElementSet::GetEntry()

to allow Example/TestCopyDicom.cxx to compile
(she shall have to decide if we consider the modif as permanent, or if we remove TestCopyDicom.cxx)

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index d41fbf510ba1d93e45beab52df98354e0e48d638..d0b259ed6dc5c6f3a3ca7a7f9069c39b3c7ecdba 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/08/31 14:24:47 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2004/09/03 07:57:10 $
+  Version:   $Revision: 1.18 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -59,7 +59,7 @@ public:
    std::string  GetVR()        { return DictEntry->GetVR();     };
 
    /// \brief Returns offset (since the beginning of the file, including
-   /// the File Pramble, if any) of the value of the current Dicom HeaderEntry
+   /// the File Preamble, if any) of the value of the current Dicom HeaderEntry
    /// \warning offset of the *value*, not of the Dicom Header Entry
    size_t       GetOffset()    { return Offset;             };
 
@@ -104,7 +104,7 @@ public:
    bool IsImplicitVR() { return ImplicitVR; };
 
    /// \brief Tells us if the VR of the current Dicom Element is Unknown
-   /// @return true if the VR is unkonwn
+   /// @return true if the VR is unknown
    bool IsVRUnknown() { return DictEntry->IsVRUnknown(); };
 
    /// \brief   Sets the DicEntry of the current Dicom Element

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index fdbe8ba89c79901e8639e2856fe95beaaaf81821..6a2b4a34a3f339cb095575da6624e333771f90c4 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/03 04:16:29 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2004/09/03 07:57:10 $
+  Version:   $Revision: 1.34 $
  
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,10 +50,6 @@ private:
    /// \brief Optional "shadow dictionary" (private elements) used to parse
    /// this header
    gdcmDict *RefShaDict;
-   
-   /// \brief Equals =1 if user wants to skip shadow groups while parsing
-   /// (to save space)
-   int IgnoreShadow;
 
    /// \brief Size threshold above which an element value will NOT be loaded
    /// in memory (to avoid loading the image/volume itself). By default,

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 985adfdc2082eb9f48551f4906bed23b3660ade8..df53414689ba4092a7debf80d45c1491547b98b2 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/03 04:16:29 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/09/03 07:57:10 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -46,6 +46,7 @@ public:
 
    /// Accessor to \ref gdcmElementSet::tagHT
    // Do not expose this to user (public API) !
+   //I re-add it temporaryly JPRx
    TagDocEntryHT &GetEntry() { return TagHT; };
 
 protected:

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 84288ff1dfabf71600cea9c0b193761118a79b71..908370961863810ff393fd9bf7c9e625f16758df 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: 2004/09/01 16:23:59 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2004/09/03 07:57:10 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -131,20 +131,23 @@ private:
   ///        ==-1 if ImageData never read                       
    int PixelRead;
    
+  /// wether already parsed 
+   bool Parsed;
+      
   /// \brief length of the last allocated area devoided to receive Pixels
   ///        ( to allow us not to (free + new) if un necessary )     
    size_t LastAllocatedPixelDataLength; 
    
-   /// \brief Samples Per Pixel           (0x0028,0x0002), as found on disk
+  /// \brief Samples Per Pixel           (0x0028,0x0002), as found on disk
    std::string InitialSpp;
-   /// \brief Photometric Interpretation  (0x0028,0x0004), as found on disk
+  /// \brief Photometric Interpretation  (0x0028,0x0004), as found on disk
    std::string InitialPhotInt;
-   /// \brief Planar Configuration        (0x0028,0x0006), as found on disk   
+  /// \brief Planar Configuration        (0x0028,0x0006), as found on disk   
    std::string InitialPlanConfig;    
-   /// \brief Bits Allocated              (0x0028,0x0100), as found on disk
+  /// \brief Bits Allocated              (0x0028,0x0100), as found on disk
    std::string InitialBitsAllocated;
-   /// wether already parsed 
-   bool Parsed;
+   
+
 };
 
 //-----------------------------------------------------------------------------