Mercurial > hg > orthanc-stone
diff Framework/Toolbox/GenericToolbox.h @ 1331:ab81ee8fce1f broker
- Viewport is not passed and stored as a shared_ptr instead
of raw reference.
- ViewportController can now be injected with an undo
stack (not a ctor param anymore, as a preparation for the
move of the undo stack to an interactor)
- Added (temp) flag to disable emscripten events registration
in the WebAssemblyViewport (because legacy client code
deals with them directly)
- Added emscripten_clear_timeout in ~WebGLViewportsRegistry
- Removed GenericToolbox::HoldingRef whose responsibility is
better served with proper callback un-registration.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 30 Mar 2020 14:23:46 +0200 |
| parents | fd616c4a5904 |
| children | 30deba7bc8e2 |
line wrap: on
line diff
--- a/Framework/Toolbox/GenericToolbox.h Mon Mar 30 08:47:30 2020 +0200 +++ b/Framework/Toolbox/GenericToolbox.h Mon Mar 30 14:23:46 2020 +0200 @@ -21,6 +21,7 @@ #pragma once #include <Core/Compatibility.h> +#include <Core/OrthancException.h> #include <boost/shared_ptr.hpp> @@ -303,35 +304,5 @@ { return GetRgbaValuesFromString(red, green, blue, alpha, text.c_str()); } - - - template<typename Wrappee> - struct HoldingRef - { - HoldingRef(Wrappee* object) - { - // a crash here means that the object is not stored in a shared_ptr - // using shared_ptr is mandatory for this - object_ = object->shared_from_this(); - } - boost::shared_ptr<Wrappee> object_; - - static void* Wrap(Wrappee* object) - { - std::unique_ptr<HoldingRef<Wrappee > > up(new HoldingRef<Wrappee>(object)); - void* userData = reinterpret_cast<void*>(up.release()); - return userData; - } - - static boost::shared_ptr<Wrappee> Unwrap(void* userData) - { - // the stored shared_ptr will be deleted because of wrapping - // the data in a RAII - std::unique_ptr<HoldingRef<Wrappee > > - up(reinterpret_cast<HoldingRef<Wrappee>*>(userData)); - boost::shared_ptr<Wrappee> object = up->object_; - return object; - } - }; } }