#2500 creaImageIO Bug New Normal - Boost signals deprecated -> signals2 (cleanning...

diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index 0281042c2c1e5e62502f8c8972c3cfb9d22f1348..2cca5ad7fe699d1f7f087e3c46891f9ff9af252c 100644 (file)
--- a/src/creaImageIOGimmickView.cpp
+++ b/src/creaImageIOGimmickView.cpp
@@ -746,7 +746,7 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
        else if (im.size()>1) // Test inutile ? JPR
        {
                /// \TODO fix unused variable 'first'
-               vtkImageData* first = mReader.GetImage( im.front());
+//             vtkImageData* first = mReader.GetImage( im.front());
                if (dimension == 2)
                {
                 // n3D
@@ -756,10 +756,8 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
                                vtkImageData* out = vtkImageData::New();
                                out->ShallowCopy(mReader.GetImage(*it));
                                s.push_back(out);
-                       }
-               }
-               else
-               {
+                       } // for
+               } else {
                        // n2D to 3D // NO!
                        // n *2D + T in a vector :
                        
@@ -768,9 +766,9 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
                        {
                                vtkImageData* out = mReader.GetImage( (*it));
                                s.push_back(out);
-                       }
-               }
-       }
+                       } // for
+               } // if dimension
+       } // if im.size
 }
   //======================================================================
 
@@ -901,8 +899,9 @@ void GimmickView::Anonymize(std::vector<std::string> i_filenames, int type)
                
                // We need a gdcm::FileHelper, since we want to load the pixels        
                GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(file);
-       
-   uint8_t *imageData = fh->GetImageData();
+
+//Borrame
+//EED   uint8_t *imageData = fh->GetImageData();
 
           // Institution name 
           file->AddAnonymizeElement(0x0008, 0x0080, "*"); 

diff --git a/src/creaImageIOGimmickView.h b/src/creaImageIOGimmickView.h
index 02b35d8d26c4d80b9d9aad795accf2ff4f4adae4..d0016904bcf0ca61ffed2c540b18733044e9022d 100644 (file)
--- a/src/creaImageIOGimmickView.h
+++ b/src/creaImageIOGimmickView.h
@@ -46,7 +46,7 @@
 
 
 // Signal/slot mechanism for progress events
-#include <boost/signal.hpp>
+#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
 
 #define GIMMICK_NO_IMAGE_SELECTION 0
@@ -202,7 +202,7 @@ namespace creaImageIO
       vtkImageData* GetDefaultImage() { return mReader.GetImage(""); }
 
       //=============================================
-      typedef boost::signal<void (bool)>  ValidationSignalType;
+      typedef boost::signals2::signal<void (bool)>  ValidationSignalType;
       typedef ValidationSignalType::slot_function_type ValidationCallbackType;
       //=============================================
 

diff --git a/src/creaImageIOListener.h b/src/creaImageIOListener.h
index 6d50422f4936d0e8ae70e7fa3e42f0dba9f1dd97..9f5e5d967b10f9331c3d6b075de9ac7ec3af08d8 100644 (file)
--- a/src/creaImageIOListener.h
+++ b/src/creaImageIOListener.h
@@ -34,7 +34,7 @@
 #include <time.h>
 #include <wx/thread.h>
 // Signal/slot mechanism
-#include <boost/signal.hpp>
+#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
 #include <boost/thread/mutex.hpp>
 
@@ -63,7 +63,7 @@ namespace creaImageIO
 
        ///Related with signals
        //=============================================
-    typedef boost::signal<void (bool)>  MountingSignalType;
+    typedef boost::signals2::signal<void (bool)>  MountingSignalType;
     typedef MountingSignalType::slot_function_type MountingCallbackType;
     //=============================================
 

diff --git a/src/creaImageIOSynchron.cpp b/src/creaImageIOSynchron.cpp
index 9a6af0cf3451af06ee958764a4d2dd8d9d18ce73..8ae670f60fde80856638a28e3f2d797dd747de74 100644 (file)
--- a/src/creaImageIOSynchron.cpp
+++ b/src/creaImageIOSynchron.cpp
@@ -138,12 +138,12 @@ namespace creaImageIO
                do
                {
                        pos = str.find('\\');
-                       if (pos!=-1)  
+                       if ( pos != (size_t)-1 )  
                        {
                                str.replace(pos, 1, "/");
                        }
                }
-               while (pos!=-1);
+               while ( pos != (size_t)-1 );
        }
 
        //=====================================================================
@@ -436,7 +436,7 @@ namespace creaImageIO
                query = "SELECT PATH, REMOVE FROM IGNORED_FILES WHERE";
                if(keys.size() > 0)
                {
-                       for (int i=0; i < keys.size(); i++)
+                       for (int i=0; i < (int)keys.size(); i++)
                        {
                                query += " ADD_KEY = " + keys[i];
                                query += " AND";

diff --git a/src/creaImageIOTreeHandlerImageAdder.h b/src/creaImageIOTreeHandlerImageAdder.h
index 435fbf94d9fe17a64a04eeaced2224a713243263..79c855e986b5f44d786104685399603bb7b29064 100644 (file)
--- a/src/creaImageIOTreeHandlerImageAdder.h
+++ b/src/creaImageIOTreeHandlerImageAdder.h
@@ -34,7 +34,7 @@
 //#include <creaImageIOImageWriter.h>
 
 // Signal/slot mechanism for progress events
-#include <boost/signal.hpp>
+#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
 #if defined(USE_GDCM2)
 #include "creaImageIODicomScanner.h"
@@ -112,7 +112,7 @@ namespace creaImageIO
     //=============================================
 
     //=============================================
-    typedef boost::signal<void (Progress&)>  ProgressSignalType;
+    typedef boost::signals2::signal<void (Progress&)>  ProgressSignalType;
     typedef ProgressSignalType::slot_function_type ProgressCallbackType;
     //=============================================
 

diff --git a/src/creaImageIOWxGimmickPanel.h b/src/creaImageIOWxGimmickPanel.h
index 77e5aa0cc874ebb77a08ade5ce2cb3c6b977e5e9..cb74ee122a68489f152ebc5b67897a0ad34112de 100644 (file)
--- a/src/creaImageIOWxGimmickPanel.h
+++ b/src/creaImageIOWxGimmickPanel.h
@@ -32,7 +32,7 @@
 #ifdef USE_WXWIDGETS
 
 // Signal/slot mechanism for progress events
-#include <boost/signal.hpp>
+#include <boost/signals2/signal.hpp>
 #include <boost/bind.hpp>
 
 #include <creaImageIOWxGimmickView.h>
@@ -60,7 +60,7 @@ namespace creaImageIO
     ~WxGimmickPanel();
 
       //=============================================
-      typedef boost::signal<void (bool)> SendImageSignalType;
+      typedef boost::signals2::signal<void (bool)> SendImageSignalType;
       typedef SendImageSignalType::slot_function_type SendImageCallbackType;
       //=============================================