# HG changeset patch
# User jodogne
# Date 1477565252 -7200
# Node ID 952b2c6ee0a2ea3ecaeaf81473f3edbd1968832e
# Parent  4f32a0c255dc0d5ed731b0cf7fdbe0829e9ccb29
fix msvc

diff -r 4f32a0c255dc -r 952b2c6ee0a2 Applications/CMakeLists.txt
--- a/Applications/CMakeLists.txt	Thu Oct 27 12:44:35 2016 +0200
+++ b/Applications/CMakeLists.txt	Thu Oct 27 12:47:32 2016 +0200
@@ -171,7 +171,12 @@
   ${ORTHANC_ROOT}/Resources/ThirdParty/base64/base64.cpp
   )
 
-source_group(ThirdParty\\OrthancCore REGULAR_EXPRESSION ${ORTHANC_ROOT}/.*)
+EmbedResources(
+  ${DCMTK_DICTIONARIES}
+  BRIGHTFIELD_OPTICAL_PATH  ${ORTHANC_WSI_DIR}/Resources/BrightfieldOpticalPath.json
+  SAMPLE_DATASET            ${ORTHANC_WSI_DIR}/Resources/SampleDataset.json
+  SRGB_ICC_PROFILE          ${ORTHANC_WSI_DIR}/Resources/sRGB.icc
+  )
 
 
 #####################################################################
@@ -186,6 +191,8 @@
 
   ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS(
     "PrecompiledHeadersWSI.h" "${ORTHANC_WSI_DIR}/Framework/PrecompiledHeadersWSI.cpp" ORTHANC_WSI_SOURCES)
+
+  source_group(ThirdParty\\OrthancCore FILES ${ORTHANC_CORE_SOURCES})
 endif()
 
 
@@ -193,14 +200,6 @@
 ## Create the static library containing the framework
 #####################################################################
 
-EmbedResources(
-  ${DCMTK_DICTIONARIES}
-  BRIGHTFIELD_OPTICAL_PATH  ${ORTHANC_WSI_DIR}/Resources/BrightfieldOpticalPath.json
-  SAMPLE_DATASET            ${ORTHANC_WSI_DIR}/Resources/SampleDataset.json
-  SRGB_ICC_PROFILE          ${ORTHANC_WSI_DIR}/Resources/sRGB.icc
-  )
-
-
 add_library(OrthancWSIFramework STATIC
   ${ORTHANC_CORE_SOURCES}
   ${ORTHANC_WSI_SOURCES}
diff -r 4f32a0c255dc -r 952b2c6ee0a2 Applications/Dicomizer.cpp
--- a/Applications/Dicomizer.cpp	Thu Oct 27 12:44:35 2016 +0200
+++ b/Applications/Dicomizer.cpp	Thu Oct 27 12:47:32 2016 +0200
@@ -299,8 +299,8 @@
   if (!item->putAndInsertString(DCM_DimensionOrganizationUID, uid.c_str()).good() ||
       !a1->putTagVal(DCM_FrameContentSequence).good() ||
       !a2->putTagVal(DCM_DimensionIndexValues).good() ||
-      !item->insert(a1.release(), uid.c_str()).good() ||
-      !item->insert(a2.release(), uid.c_str()).good() ||
+      !item->insert(a1.release()).good() ||
+      !item->insert(a2.release()).good() ||
       !sequence->insert(item.release(), false, false).good() ||
       !dataset.insert(sequence.release(), true, false).good())
   {
diff -r 4f32a0c255dc -r 952b2c6ee0a2 ViewerPlugin/CMakeLists.txt
--- a/ViewerPlugin/CMakeLists.txt	Thu Oct 27 12:44:35 2016 +0200
+++ b/ViewerPlugin/CMakeLists.txt	Thu Oct 27 12:47:32 2016 +0200
@@ -190,8 +190,6 @@
   ${ORTHANC_ROOT}/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
   )
 
-source_group(ThirdParty\\OrthancCore REGULAR_EXPRESSION ${ORTHANC_ROOT}/.*)
-
 
 #####################################################################
 ## Setup precompiled headers for Microsoft Visual Studio
@@ -205,6 +203,8 @@
 
   ADD_VISUAL_STUDIO_PRECOMPILED_HEADERS(
     "PrecompiledHeadersWSI.h" "${ORTHANC_WSI_DIR}/Framework/PrecompiledHeadersWSI.cpp" ORTHANC_WSI_SOURCES)
+
+  source_group(ThirdParty\\OrthancCore FILES ${ORTHANC_CORE_SOURCES})
 endif()