minor typo

diff --git a/src/gdcmDataEntry.cxx b/src/gdcmDataEntry.cxx
index e318600b245f02cd530f2854b4c410b92189823d..2475028b5040132d07b9717944e1985c92c32cfe 100644 (file)
--- a/src/gdcmDataEntry.cxx
+++ b/src/gdcmDataEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDataEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/09 12:23:38 $
-  Version:   $Revision: 1.25 $
+  Date:      $Date: 2005/12/21 14:52:12 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -495,7 +495,7 @@ void DataEntry::WriteContent(std::ofstream *fp, FileType filetype)
       return; //delimitors have NO value
    }
    
-   // --> We only deal with Little Endian writting
+   // --> We only deal with Little Endian writting.
    // --> forget Big Endian Transfer Syntax writting!
    //     Next DICOM version will give it up ...
  
@@ -567,7 +567,8 @@ gdcmDebugMacro ("AtomicLength = 2 found; lgt =" << l);
       //  --> WARNING : nothing is written; 
       //  --> the initial data (on the the source image) is lost
       //  --> user is *not* informed !
-      
+      gdcmDebugMacro ("Nothing was loaded, but we need to skip space on disc. "
+                      << "Length =" << l );   
       fp->seekp(l, std::ios::cur);
    }
    // to avoid gdcm to propagate oddities

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index f343fb60846218253972b1bf4c0bbb6c83e622b0..4b91fc3543e96f60461619ec9e4a17b47929b832 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: 2005/11/29 12:48:46 $
-  Version:   $Revision: 1.79 $
+  Date:      $Date: 2005/12/21 14:52:12 $
+  Version:   $Revision: 1.80 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -17,6 +17,7 @@
 =========================================================================*/
 
 #include "gdcmDocEntry.h"
+#include "gdcmDataEntry.h"
 #include "gdcmTS.h"
 #include "gdcmVR.h"
 #include "gdcmGlobal.h"
@@ -70,17 +71,21 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
 {
    uint32_t ffff  = 0xffffffff;
    uint16_t group = GetGroup();
+   
+   ///\todo allow skipping Shadow groups 
+   
    VRKey vr       = GetVR();
-   uint16_t el    = GetElement();
+   uint16_t elem  = GetElement();
    uint32_t lgth  = GetLength();
 
-   if ( group == 0xfffe && el == 0x0000 )
+   if ( group == 0xfffe && elem == 0x0000 )
    {
      // Fix in order to make some MR PHILIPS images e-film readable
      // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
      // we just *always* ignore spurious fffe|0000 tag !   
       return;
    }
+ 
    //
    // ----------- Writes the common part
    //
@@ -91,7 +96,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype)
    
  // ----------- Writes the common part : the Tag   
    binary_write( *fp, group); //group number
-   binary_write( *fp, el);    //element number
+   binary_write( *fp, elem);  //element number
 
    // Dicom V3 group 0x0002 is *always* Explicit VR !
    if ( filetype == ExplicitVR || filetype == JPEG || group == 0x0002 )

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index e74bb75350ec721f33c1a87eabf442237d921fd5..1c5bebc48f7a4571e12a4ecb82b8e37e0aa575d5 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/12/15 13:36:55 $
-  Version:   $Revision: 1.312 $
+  Date:      $Date: 2005/12/21 14:52:12 $
+  Version:   $Revision: 1.313 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1506,7 +1506,7 @@ bool File::Write(std::string fileName, FileType writetype)
       e0000->SetString(sLen.str());
    }
 
-   // FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx
+   /// \todo FIXME : Derma?.dcm does not have it...let's remove it ?!? JPRx
    if( writetype != JPEG )
    {
       int i_lgPix = GetEntryLength(GrPixel, NumPixel);
@@ -1526,6 +1526,7 @@ bool File::Write(std::string fileName, FileType writetype)
    return true;
 }
 
+
 //-----------------------------------------------------------------------------
 // Protected
 

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index af09e7978a2eba87a9a053eed020e35b508c2dd0..d58bc54e566d7d31fca737dc42ae90c4bf8dda60 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: 2005/11/28 11:54:51 $
-  Version:   $Revision: 1.122 $
+  Date:      $Date: 2005/12/21 14:52:13 $
+  Version:   $Revision: 1.123 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -171,9 +171,10 @@ public:
    void AnonymizeNoLoad();
    /// Replace patient's own information by info from the Anonymization list
    bool AnonymizeFile();
-
+  
    bool Write(std::string fileName, FileType filetype);
 
+   
 protected:
    File();
    ~File();