Mercurial > hg > orthanc
comparison OrthancServer/ServerContext.cpp @ 3839:5bba4d249422 transcoding
integration mainline->transcoding
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 15 Apr 2020 22:03:21 +0200 |
parents | 023b2a9f3aa1 0c16051dfd56 |
children | 8f7ad4989fec |
comparison
equal
deleted
inserted
replaced
3829:4fde7933e504 | 3839:5bba4d249422 |
---|---|
689 that_(that), | 689 that_(that), |
690 lock_(that_.dicomCacheMutex_) | 690 lock_(that_.dicomCacheMutex_) |
691 { | 691 { |
692 #if ENABLE_DICOM_CACHE == 0 | 692 #if ENABLE_DICOM_CACHE == 0 |
693 static std::unique_ptr<IDynamicObject> p; | 693 static std::unique_ptr<IDynamicObject> p; |
694 p.reset(provider_.Provide(instancePublicId)); | 694 p.reset(that_.provider_.Provide(instancePublicId)); |
695 dicom_ = dynamic_cast<ParsedDicomFile*>(p.get()); | 695 dicom_ = dynamic_cast<ParsedDicomFile*>(p.get()); |
696 #else | 696 #else |
697 dicom_ = &dynamic_cast<ParsedDicomFile&>(that_.dicomCache_.Access(instancePublicId)); | 697 dicom_ = &dynamic_cast<ParsedDicomFile&>(that_.dicomCache_.Access(instancePublicId)); |
698 #endif | 698 #endif |
699 } | 699 } |