diff Framework/SmartLoader.cpp @ 378:814fa32e2fcc

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Nov 2018 14:21:02 +0100
parents 8eb4fe74000f
children ba5ad93f935a
line wrap: on
line diff
--- a/Framework/SmartLoader.cpp	Mon Nov 05 16:18:27 2018 +0100
+++ b/Framework/SmartLoader.cpp	Tue Nov 06 14:21:02 2018 +0100
@@ -74,9 +74,7 @@
       {
         LOG(WARNING) << "ScheduleLayerCreation for CachedSlice (image is loaded): " << slice_->GetOrthancInstanceId();
         bool isFull = (effectiveQuality_ == SliceImageQuality_FullPng || effectiveQuality_ == SliceImageQuality_FullPam);
-        std::auto_ptr<Orthanc::ImageAccessor> accessor(new Orthanc::ImageAccessor());
-        image_->GetReadOnlyAccessor(*accessor);
-        LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(accessor.release(), *slice_, isFull),
+        LayerSourceBase::NotifyLayerReady(FrameRenderer::CreateRenderer(*image_, *slice_, isFull),
                                           slice_->GetGeometry(), false);
       }
       else
@@ -239,9 +237,9 @@
     LOG(WARNING) << "Image ready: " << sliceKeyId;
 
     boost::shared_ptr<CachedSlice> cachedSlice(new CachedSlice(IObserver::broker_));
-    cachedSlice->image_ = message.image_;
-    cachedSlice->effectiveQuality_ = message.imageQuality_;
-    cachedSlice->slice_.reset(message.slice_.Clone());
+    cachedSlice->image_.reset(Orthanc::Image::Clone(message.GetImage()));
+    cachedSlice->effectiveQuality_ = message.GetImageQuality();
+    cachedSlice->slice_.reset(message.GetSlice().Clone());
     cachedSlice->status_ = CachedSliceStatus_ImageLoaded;
 
     cachedSlices_[sliceKeyId] = cachedSlice;