Mercurial > hg > orthanc-wsi

changeset 21:d10ff48e47ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix warnings in msvc
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 27 Oct 2016 11:35:43 +0200
parents 482ff9a4506f
children 6e84b48851f7
files Framework/Orthanc/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp ViewerPlugin/CMakeLists.txt
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Orthanc/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Thu Oct 27 11:25:09 2016 +0200
+++ b/Framework/Orthanc/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Thu Oct 27 11:35:43 2016 +0200
@@ -526,11 +526,11 @@
         return true;
         
       case Json::intValue:
-        target = configuration_[key].asInt();
+        target = static_cast<float>(configuration_[key].asInt());
         return true;
         
       case Json::uintValue:
-        target = configuration_[key].asUInt();
+        target = static_cast<float>(configuration_[key].asUInt());
         return true;
         
       default:
--- a/ViewerPlugin/CMakeLists.txt	Thu Oct 27 11:25:09 2016 +0200
+++ b/ViewerPlugin/CMakeLists.txt	Thu Oct 27 11:35:43 2016 +0200
@@ -91,8 +91,6 @@
   link_libraries(rt)
 
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-  SET(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lws2_32")
-
   execute_process(
     COMMAND 
     ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py