removal of method WriteBase

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index ae7e2ab2104f1676f472fbac18f1c5e91d80760a..f9780b8b1bd7f1eab78f2f5fa7683da5b5d9d2be 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: 2004/12/16 13:46:37 $
-  Version:   $Revision: 1.179 $
+  Date:      $Date: 2005/01/06 08:46:21 $
+  Version:   $Revision: 1.180 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -438,54 +438,13 @@ bool File::WriteAcr (std::string const & fileName)
    return Write(fileName);
 }
 
-bool File::Write(std::string const& fileName)
-{
-   return WriteBase(fileName);
-}
-
-bool File::SetEntryByNumber(std::string const& content,
-                            uint16_t group, uint16_t element)
-{ 
-   return HeaderInternal->SetEntryByNumber(content,group,element);
-}
-
-bool File::SetEntryByNumber(uint8_t* content, int lgth,
-                            uint16_t group, uint16_t element)
-{
-   return HeaderInternal->SetEntryByNumber(content,lgth,group,element);
-}
-
-bool File::ReplaceOrCreateByNumber(std::string const& content,
-                                   uint16_t group, uint16_t element)
-{
-   return HeaderInternal->ReplaceOrCreateByNumber(content,group,element) != NULL;
-}
-
-bool File::ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
-                                   uint16_t group, uint16_t element)
-{
-   return HeaderInternal->ReplaceOrCreateByNumber(binArea,lgth,group,element) != NULL;
-}
-
-/**
- * \brief Access to the underlying \ref PixelReadConverter RGBA LUT
- */
-uint8_t* File::GetLutRGBA()
-{
-   return PixelReadConverter->GetLutRGBA();
-}
-
-//-----------------------------------------------------------------------------
-// Protected
 /**
- * \brief NOT a end user inteded function
- *        (used by WriteDcmExplVR, WriteDcmImplVR, WriteAcr, etc)
+ * \brief Writes on disk A SINGLE Dicom file, 
  * @param fileName name of the file to be created
  *                 (any already existing file is overwritten)
- * @param  type file type (ExplicitVR, ImplicitVR, ...)
  * @return false if write fails
  */
-bool File::WriteBase (std::string const & fileName)
+bool File::Write(std::string const& fileName)
 {
    switch(WriteType)
    {
@@ -551,6 +510,41 @@ bool File::WriteBase (std::string const & fileName)
    return check;
 }
 
+bool File::SetEntryByNumber(std::string const& content,
+                            uint16_t group, uint16_t element)
+{ 
+   return HeaderInternal->SetEntryByNumber(content,group,element);
+}
+
+bool File::SetEntryByNumber(uint8_t* content, int lgth,
+                            uint16_t group, uint16_t element)
+{
+   return HeaderInternal->SetEntryByNumber(content,lgth,group,element);
+}
+
+bool File::ReplaceOrCreateByNumber(std::string const& content,
+                                   uint16_t group, uint16_t element)
+{
+   return HeaderInternal->ReplaceOrCreateByNumber(content,group,element) != NULL;
+}
+
+bool File::ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
+                                   uint16_t group, uint16_t element)
+{
+   return HeaderInternal->ReplaceOrCreateByNumber(binArea,lgth,group,element) != NULL;
+}
+
+/**
+ * \brief Access to the underlying \ref PixelReadConverter RGBA LUT
+ */
+uint8_t* File::GetLutRGBA()
+{
+   return PixelReadConverter->GetLutRGBA();
+}
+
+//-----------------------------------------------------------------------------
+// Protected
+
 /**
  * \brief Check the write integrity
  *

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index d646cd01d8bb6137aaeec74e8c100b80718ee003..af9382efac99beb6e325683ae3bc0eb660075105 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/12/16 13:46:37 $
-  Version:   $Revision: 1.89 $
+  Date:      $Date: 2005/01/06 08:46:21 $
+  Version:   $Revision: 1.90 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -112,7 +112,6 @@ public:
    FileType GetWriteType()            { return WriteType; };
 
 protected:
-   bool WriteBase(std::string const& fileName);
    bool CheckWriteIntegrity();
 
    void SetWriteToRaw();