Comment out GDCM_LEGACY_REMOVE function

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 4ccb1e7ae0b52a14856c7b130a601333be791600..e24e4f540ab73f7d3a53349470f00846ed99adc2 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: 2006/04/11 16:03:26 $
-  Version:   $Revision: 1.318 $
+  Date:      $Date: 2006/05/30 08:18:50 $
+  Version:   $Revision: 1.319 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -251,8 +251,8 @@ bool File::DoTheLoadingJob( )
       }
 */
          VRKey PixelVR;
-         // 8 bits allocated is a 'O Bytes' , as well as 24 (old ACR-NEMA RGB)
-         // more than 8 (i.e 12, 16) is a 'O Words'
+         // 8 bits allocated is a 'OB(ytes)' , as well as 24 (old ACR-NEMA RGB)
+         // more than 8 (i.e 12, 16) is a 'OW(ords)'
          if ( GetBitsAllocated() == 8 || GetBitsAllocated() == 24 ) 
             PixelVR = "OB";
          else
@@ -1381,6 +1381,10 @@ void File::AnonymizeNoLoad()
                                it != UserAnonymizeList.end();
                              ++it)
    { 
+   
+   std::cout << "File::AnonymizeNoLoad -------" << std::hex <<(*it).Group <<"|"<< 
+               (*it).Elem 
+               << "[" << (*it).Value << "] "<< std::endl; 
       d = GetDocEntry( (*it).Group, (*it).Elem);
 
       if ( d == NULL)
@@ -1394,10 +1398,13 @@ void File::AnonymizeNoLoad()
 
       offset = d->GetOffset();
       lgth =   d->GetLength();
+      
+      std::cout << "lgth " << lgth << " valLgth " << valLgth << std::endl;
       if (valLgth < lgth)
       {
          spaces = new std::string( lgth-valLgth, ' ');
          (*it).Value = (*it).Value + *spaces;
+         std::cout << "[" << (*it).Value << "] " << lgth << std::endl;
          delete spaces;
       }
       fp->seekp( offset, std::ios::beg );
@@ -1884,7 +1891,7 @@ void File::ReadEncapsulatedBasicOffsetTable()
 
 // These are the deprecated method that one day should be removed (after the next release)
 
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
 /*
  * \ brief   Loader. (DEPRECATED :  temporaryly kept not to break the API)
  * @ param   fileName file to be open for parsing
@@ -1892,6 +1899,7 @@ void File::ReadEncapsulatedBasicOffsetTable()
  *         or no tag was found.
  * @deprecated Use the Load() [ + SetLoadMode() ] + SetFileName() functions instead
  */
+ /*
 bool File::Load( std::string const &fileName ) 
 {
    GDCM_LEGACY_REPLACED_BODY(File::Load(std::string), "1.2",
@@ -1903,7 +1911,7 @@ bool File::Load( std::string const &fileName )
    return DoTheLoadingJob( );
 }
 #endif
-
+*/
 //-----------------------------------------------------------------------------
 // Print
 

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 0eae98f22d514c8532dd87e6e9d1938a7471e870..efd05fb60be201868b8e49aaf501904664af4557 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: 2006/05/12 19:09:55 $
-  Version:   $Revision: 1.127 $
+  Date:      $Date: 2006/05/30 08:18:50 $
+  Version:   $Revision: 1.128 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -104,7 +104,7 @@ public:
    static File *New() {return new File();}
 
    // Loading
-   GDCM_LEGACY(bool Load( std::string const &filename ))
+  // GDCM_LEGACY(bool Load( std::string const &filename ))
    bool Load();
    // Standard values and informations contained in the header
    bool IsReadable();