* Fix memory leaks

[gdcm.git] / src / gdcmFileHelper.cxx

diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx
index 257bace4286f9054ea7978fe080075f25886af03..e2326b53faf0abf8d6af3649d64fcfa207fd5c36 100644 (file)
--- a/src/gdcmFileHelper.cxx
+++ b/src/gdcmFileHelper.cxx
@@ -4,8 +4,8 @@
   Module:    $RCSfile: gdcmFileHelper.cxx,v $
   Language:  C++
 
-  Date:      $Date: 2005/10/25 14:52:34 $
-  Version:   $Revision: 1.74 $
+  Date:      $Date: 2005/10/26 08:28:58 $
+  Version:   $Revision: 1.76 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -150,8 +150,10 @@ FileHelper::FileHelper( )
  */
 FileHelper::FileHelper(File *header)
 {
+   gdcmAssertMacro(header);
+
    FileInternal = header;
-   header->Register();
+   FileInternal->Register();
    Initialize();
    if ( FileInternal->IsReadable() )
    {
@@ -180,7 +182,6 @@ FileHelper::~FileHelper()
    }
 
    FileInternal->Unregister();
-   FileInternal = 0;
 }
 
 //-----------------------------------------------------------------------------
@@ -1226,7 +1227,7 @@ To be moved to User's guide / WIKI  ?
     are force to current Date and Time
     
 -->  Conversion Type (0x0008,0x0064)
-     is forced to 'SYN'
+     is forced to 'SYN' (Synthetic Image)
      
 --> Study ID, Series Number, Instance Number, Patient Orientation (Type 2)
     are created, with empty value if there are missing.
@@ -1418,8 +1419,22 @@ void FileHelper::CheckMandatoryElements()
    // Accession Number
    CopyMandatoryEntry(0x0008,0x0050,"");
    
-   // Conversion Type ... FIXME (type 1)
+   // Conversion Type.
+   // Other possible values are :
    // See PS 3.3, Page 408
+   
+   // DV = Digitized Video
+   // DI = Digital Interface   
+   // DF = Digitized Film
+   // WSD = Workstation
+   // SD = Scanned Document
+   // SI = Scanned Image
+   // DRW = Drawing
+   // SYN = Synthetic Image
+
+   // FIXME : Must we Force Value, or Default value ?
+   // Is it Type 1 for any Modality ?
+   //    --> Answer seems to be NO :-(
    CopyMandatoryEntry(0x0008,0x0064,"SYN");
 
 // ----- Add Mandatory Entries if missing ---