#2844 creaMaracasVisu Feature New Normal - ManualPaint_model box, Refresh TransferF...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / OpenImageDialog.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
index 9012c4eb044d1dca3642051d9e1a5656bde82f5b..3c0f1d58393fd219a5c7aace864e2722fd9bc7fe 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/OpenImageDialog.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #include "OpenImageDialog.h"
 #include "creaWx.h"
@@ -43,28 +68,29 @@ namespace creaMaracasVisuKernel{
                        GETIMAGEDATADIALOG getImageDataDialog;
                        char * erreur;
                        int closingerror;
-                       gimmickhandle = dlopen ("libcreaImageIO2.so", RTLD_LAZY);                       
+                       gimmickhandle = dlopen ("libcreaImageIO.so", RTLD_LAZY);                        
                        if (! gimmickhandle) {
                                erreur = dlerror ();
                                std::cout<<erreur<<"imagehandle "<<gimmickhandle<<std::endl;                
                        }else{
                                getImageDataDialog = (GETIMAGEDATADIALOG) dlsym (gimmickhandle, "getImageDataDialog");
-                               if(!getImageDataDialog){
-                               erreur = dlerror ();
-                               std::cout<<erreur<<"getImageDataDialog "<<getImageDataDialog<<std::endl;                        
+                               if(!getImageDataDialog)
+                               {
+                                       erreur = dlerror ();
+                                       std::cout<<erreur<<"getImageDataDialog "<<getImageDataDialog<<std::endl;                        
                                }else{
                                        img = (*getImageDataDialog)();
                                        gimmickfound = true;
                                        
-                               }
+                               } // if getImageDataDialog
                                /*dlclose returns 0 on success, non-zero on error*/
                                closingerror = dlclose(gimmickhandle);
                                if(closingerror!=0){
                                        std::cout<<closingerror<<"error closing handle  "<<gimmickhandle<<std::endl;  
                                }else{
                                        std::cout<<"handle released..."<<std::endl;  
-                               }
-                       }
+                               } // if closingerror
+                       } // if gimmickhandle
 
                #endif
                }