diff ViewerPlugin/Plugin.cpp @ 150:442102e14933

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Jul 2018 09:55:24 +0200
parents 0b7e7be7d655
children fb8d4cd2f618 b798d200ac90
line wrap: on
line diff
--- a/ViewerPlugin/Plugin.cpp	Fri May 04 10:33:44 2018 +0200
+++ b/ViewerPlugin/Plugin.cpp	Tue Jul 17 09:55:24 2018 +0200
@@ -23,10 +23,10 @@
 
 #include "DicomPyramidCache.h"
 #include "../Framework/Jpeg2000Reader.h"
+#include "../Framework/Semaphore.h"
 
 #include <Core/Images/ImageProcessing.h>
 #include <Core/Images/PngWriter.h>
-#include <Core/MultiThreading/Semaphore.h>
 #include <Core/OrthancException.h>
 #include <Plugins/Samples/Common/OrthancPluginCppWrapper.h>
 #include <Plugins/Samples/Common/OrthancPluginConnection.h>
@@ -39,7 +39,7 @@
 
 std::auto_ptr<OrthancPlugins::OrthancPluginConnection>  orthanc_;
 std::auto_ptr<OrthancWSI::DicomPyramidCache>            cache_;
-std::auto_ptr<Orthanc::Semaphore>                       transcoderSemaphore_;
+std::auto_ptr<OrthancWSI::Semaphore>                    transcoderSemaphore_;
 
 
 static void AnswerSparseTile(OrthancPluginRestOutput* output,
@@ -183,7 +183,7 @@
   // decompress the raw tile
   std::auto_ptr<Orthanc::ImageAccessor> decoded;
 
-  Orthanc::Semaphore::Locker locker(*transcoderSemaphore_);
+  OrthancWSI::Semaphore::Locker locker(*transcoderSemaphore_);
 
   switch (compression)
   {
@@ -319,7 +319,7 @@
       threads = 1;
     }
     
-    transcoderSemaphore_.reset(new Orthanc::Semaphore(threads));
+    transcoderSemaphore_.reset(new OrthancWSI::Semaphore(threads));
 
     char info[1024];
     sprintf(info, "The whole-slide imaging plugin will use at most %u threads to transcode the tiles", threads);