Mercurial > hg > orthanc-wsi
comparison ViewerPlugin/Plugin.cpp @ 154:32a94bbb7d05
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 08 Oct 2018 12:12:39 +0200 |
parents | b798d200ac90 fb8d4cd2f618 |
children | 1304498491e4 |
comparison
equal
deleted
inserted
replaced
153:b798d200ac90 | 154:32a94bbb7d05 |
---|---|
21 | 21 |
22 #include "../Framework/PrecompiledHeadersWSI.h" | 22 #include "../Framework/PrecompiledHeadersWSI.h" |
23 | 23 |
24 #include "DicomPyramidCache.h" | 24 #include "DicomPyramidCache.h" |
25 #include "../Framework/Jpeg2000Reader.h" | 25 #include "../Framework/Jpeg2000Reader.h" |
26 | 26 #include "../Framework/MultiThreading/Semaphore.h" |
27 | |
28 #include <Core/Logging.h> | |
27 #include <Core/Images/ImageProcessing.h> | 29 #include <Core/Images/ImageProcessing.h> |
28 #include <Core/Images/PngWriter.h> | 30 #include <Core/Images/PngWriter.h> |
29 #include <Core/MultiThreading/Semaphore.h> | 31 #include <Core/MultiThreading/Semaphore.h> |
30 #include <Core/OrthancException.h> | 32 #include <Core/OrthancException.h> |
31 #include <Core/SystemToolbox.h> | 33 #include <Core/SystemToolbox.h> |
308 { | 310 { |
309 // We need the "/instances/.../frames/.../raw" URI that was introduced in Orthanc 1.1.0 | 311 // We need the "/instances/.../frames/.../raw" URI that was introduced in Orthanc 1.1.0 |
310 return -1; | 312 return -1; |
311 } | 313 } |
312 | 314 |
315 Orthanc::Logging::Initialize(context); | |
316 | |
313 // Limit the number of PNG transcoders to the number of available | 317 // Limit the number of PNG transcoders to the number of available |
314 // hardware threads (e.g. number of CPUs or cores or | 318 // hardware threads (e.g. number of CPUs or cores or |
315 // hyperthreading units) | 319 // hyperthreading units) |
316 unsigned int threads = Orthanc::SystemToolbox::GetHardwareConcurrency(); | 320 unsigned int threads = Orthanc::SystemToolbox::GetHardwareConcurrency(); |
317 transcoderSemaphore_.reset(new Orthanc::Semaphore(threads)); | 321 transcoderSemaphore_.reset(new Orthanc::Semaphore(threads)); |