Modifications for Windows compilation

diff --git a/common/clitkMatrix.cxx b/common/clitkMatrix.cxx
index c911f55b0f452d4e6e5b8df0af3ab1dfd0869878..2c09f311dd523416720c3496e890de46eaf1397b 100644 (file)
--- a/common/clitkMatrix.cxx
+++ b/common/clitkMatrix.cxx
@@ -17,6 +17,7 @@
 ===========================================================================**/
 
 #include "clitkMatrix.h"
+#include <algorithm>
 
 //--------------------------------------------------------------------
 namespace clitk {

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 3da4be743f0049b838b35193b49c03e0115f9e4b..1bc0759e8ee14671f60a29dcc493623f2f0293b0 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -378,12 +378,13 @@ vvMainWindow::vvMainWindow():vvMainWindowBase()
   vvToolManager::GetInstance()->InsertToolsInMenu(this);
   vvToolManager::GetInstance()->EnableToolsInMenu(this, false);
 
-#ifndef CLITK_EXPERIMENTAL
-#define CLITK_EXPERIMENTAL 0
-#endif
+//#ifndef CLITK_EXPERIMENTAL
+//#define CLITK_EXPERIMENTAL 0
+//#endif
+#ifdef CLITK_EXPERIMENTAL
   if (!CLITK_EXPERIMENTAL)
     menuExperimental->menuAction()->setVisible(false);
-
+#endif
 
   QTimer * timerMemory = new QTimer(this);
   //timerMemory->setInterval(5);
@@ -3386,7 +3387,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget)
       vidwriter = mpg;
       mpg->SetQuality(2);
       bool ok;
-      int fps = QInputDialog::getInteger(this, tr("Number of frames per second"),
+      int fps = QInputDialog::getInt(this, tr("Number of frames per second"),
         tr("FPS:"), 5, 0, 1024, 1, &ok);
       if(!ok)
         fps = 5;
@@ -3399,7 +3400,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget)
       vidwriter = mpg;
       mpg->SetQuality(2);
       bool ok;
-      int fps = QInputDialog::getInteger(this, tr("Number of frames per second"),
+      int fps = QInputDialog::getInt(this, tr("Number of frames per second"),
         tr("FPS:"), 5, 0, 1024, 1, &ok);
       if(!ok)
         fps = 5;