Mercurial > hg > orthanc-stone

diff Framework/Viewport/WebAssemblyViewport.cpp @ 1307:8a28a9bf8876 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ViewportController now gets a ref to its parent viewport for proper lock usage
author Benjamin Golinvaux <bgo@osimis.io>
date Wed, 04 Mar 2020 10:07:37 +0100
parents 7ec8fea061b9
children adf234ecaa00
line wrap: on
line diff
--- a/Framework/Viewport/WebAssemblyViewport.cpp	Wed Mar 04 10:07:14 2020 +0100
+++ b/Framework/Viewport/WebAssemblyViewport.cpp	Wed Mar 04 10:07:37 2020 +0100
@@ -213,11 +213,11 @@
   {
     if (scene == NULL)
     {
-      controller_ = boost::make_shared<ViewportController>();
+      controller_ = boost::make_shared<ViewportController>(*this);
     }
     else
     {
-      controller_ = boost::make_shared<ViewportController>(*scene);
+      controller_ = boost::make_shared<ViewportController>(*this,*scene);
     }
 
     LOG(INFO) << "Initializing Stone viewport on HTML canvas: " << canvasId;