FIX: Pb on recent linux machine

[gdcm.git] / src / gdcmDocEntry.cxx

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index cd53a4b0e99c94d82eee6c43981cdbf8105e78e7..208bd1e6e1e15251d4ae66387c97ee452a2cc92c 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 00:59:21 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2004/09/03 15:09:30 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -36,7 +36,8 @@
 gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in)
 {
    ImplicitVR = false;
-   entry = in;
+   DictEntry  = in;
+   Offset     = 0 ; // To avoid further missprinting
 }
 
 //-----------------------------------------------------------------------------
@@ -48,7 +49,7 @@ gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in)
  */
 void gdcmDocEntry::Print(std::ostream & os)
 {
-   printLevel=2; // FIXME
+   PrintLevel = 2; // FIXME
    
    size_t o;
    unsigned short int g, e;
@@ -66,7 +67,7 @@ void gdcmDocEntry::Print(std::ostream & os)
    sprintf(greltag,"%04x|%04x ",g,e);           
    s << greltag ;
        
-   if (printLevel>=2)
+   if (PrintLevel >= 2)
    {
       s << "lg : ";
       lgth = GetReadLength(); // ReadLength, as opposed to UsableLength
@@ -97,7 +98,7 @@ void gdcmDocEntry::Print(std::ostream & os)
 
    s << "[" << vr  << "] ";
 
-   if (printLevel >= 1)
+   if (PrintLevel >= 1)
    {
       s.setf(std::ios::left);
       s << std::setw(66-GetName().length()) << " ";
@@ -110,6 +111,8 @@ void gdcmDocEntry::Print(std::ostream & os)
 /**
  * \ingroup gdcmDocEntry
  * \brief   Writes the common part of any gdcmValEntry, gdcmBinEntry, gdcmSeqEntry
+ * @param fp already open file pointer
+ * @param filetype type of the file to be written
  */
 void gdcmDocEntry::Write(FILE *fp, FileType filetype)
 {
@@ -119,7 +122,7 @@ void gdcmDocEntry::Write(FILE *fp, FileType filetype)
    uint16_t el    = GetElement();
    uint32_t lgr   = GetReadLength();
 
-   if ( (group == 0xfffe) && (el == 0x0000) )
+   if ( group == 0xfffe && el == 0x0000 )
    {
      // Fix in order to make some MR PHILIPS images e-film readable
      // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
@@ -235,12 +238,12 @@ uint32_t gdcmDocEntry::GetFullLength()
  */
 void gdcmDocEntry::Copy (gdcmDocEntry* e)
 {
-   entry        = e->entry;
+   DictEntry    = e->DictEntry;
    UsableLength = e->UsableLength;
    ReadLength   = e->ReadLength;
    ImplicitVR   = e->ImplicitVR;
    Offset       = e->Offset;
-   printLevel   = e->printLevel;
+   PrintLevel   = e->PrintLevel;
    // TODO : remove gdcmDocEntry SQDepth
 }
 
@@ -249,7 +252,7 @@ void gdcmDocEntry::Copy (gdcmDocEntry* e)
  * \brief   tells us if entry is the last one of a 'no length' SequenceItem 
  *          (fffe,e00d) 
  */
-bool gdcmDocEntry::isItemDelimitor()
+bool gdcmDocEntry::IsItemDelimitor()
 {
    return (GetGroup() == 0xfffe && GetElement() == 0xe00d);
 }
@@ -258,7 +261,7 @@ bool gdcmDocEntry::isItemDelimitor()
  * \brief   tells us if entry is the last one of a 'no length' Sequence 
  *          (fffe,e0dd) 
  */
-bool gdcmDocEntry::isSequenceDelimitor()
+bool gdcmDocEntry::IsSequenceDelimitor()
 {
    return (GetGroup() == 0xfffe && GetElement() == 0xe0dd);
 }