X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCallbackCommand.cxx;h=d1481a9b1df8e77e4dbe19a10e5b4fb447d8285b;hb=c1a305b54c1a9dd1bfe2173940ba84ccd1b4bb27;hp=05189aa078dc07261470c71bc9134c7cd13d3e58;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git

diff --git a/src/gdcmCallbackCommand.cxx b/src/gdcmCallbackCommand.cxx
index 05189aa0..d1481a9b 100644
--- a/src/gdcmCallbackCommand.cxx
+++ b/src/gdcmCallbackCommand.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCallbackCommand.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:35 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2007/10/25 08:02:38 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,21 +18,22 @@
 // ---------------------------------------------------------------
 #include "gdcmCallbackCommand.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief Constructor used when we want to generate dicom files from scratch
  */
-CallbackCommand::CallbackCommand()
+CallbackCommand::CallbackCommand() :
+   Callback(NULL), CallbackArgDelete(NULL), CallbackArg(NULL)
+   
 {
-   Callback             = NULL;
-   CallbackArgDelete    = NULL;
-   CallbackArg          = NULL;
+//   Callback             = NULL;
+//   CallbackArgDelete    = NULL;
+//   CallbackArg          = NULL;
 }
 
-
 /**
  * \brief   Canonical destructor.
  */
@@ -45,35 +46,36 @@ CallbackCommand::~CallbackCommand ()
 // Public
 /**
  * \brief   Set the callback method
- * @param   method Method to call
+ * @param   callback Method to call
  * @param   arg    Argument to pass to the method
  * \warning In python : the arg parameter isn't considered
  */
+ 
 /*void CallbackCommand::SetCallback( CallbackCommand::CbkMethod *callback,void *arg )
 {
    SetCallback(callback,arg,NULL);
 }*/
 
-/**
- * \brief   Set the callback method to delete the argument
+/*
+ *\brief   Set the callback method to delete the argument
  *          The argument is destroyed when the callback method is changed 
  *          or when the class is destroyed
- * @param   method Method to call to delete the argument
+ * @param   callback Method to call to delete the argument
  */
 /*void CallbackCommand::SetCallbackArgDelete( CallbackCommand::CbkMethod *callback ) 
 {
    CallbackArgDelete = callback;
 }*/
 
-/**
- * \brief   Set the callback method
- * @param   method Method to call
+/*
+ *\brief   Set the callback method
+ * @param   callback Method to call
  * @param   arg    Argument to pass to the method
  * @param   argDelete    Argument 
  * \warning In python : the arg parameter isn't considered
  */
 /*void CallbackCommand::SetCallback( void(*callback)(void *),
-                                   void *arg,void(*argDelete)(void *) )
+                                  void *arg, void(*argDelete)(void *) )
 {
    if ( CallbackArg && CallbackArgDelete )
    {