Mercurial > hg > orthanc-stone
changeset 993:f270852d3180
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 11 Sep 2019 12:33:12 +0200 |
parents | a9f5d0742e22 (current diff) 92a043b8e431 (diff) |
children | 1f74bc3459ba |
files | |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Messages/IObserver.h Wed Sep 11 12:31:49 2019 +0200 +++ b/Framework/Messages/IObserver.h Wed Sep 11 12:33:12 2019 +0200 @@ -45,10 +45,7 @@ // remember this is panic-level code to track zombie object usage std::string fingerprint = Orthanc::Toolbox::GenerateUuid(); const char* fingerprintRaw = fingerprint.c_str(); - ORTHANC_ASSERT(strlen(fingerprintRaw) == 36); - ORTHANC_ASSERT(fingerprintRaw[36] == 0); memcpy(fingerprint_, fingerprintRaw, 37); - LOG(TRACE) << "IObserver(" << std::hex << this << std::dec << ")::IObserver : fingerprint_ == " << fingerprint_; broker_.Register(*this); }
--- a/Platforms/Wasm/Defaults.cpp Wed Sep 11 12:31:49 2019 +0200 +++ b/Platforms/Wasm/Defaults.cpp Wed Sep 11 12:33:12 2019 +0200 @@ -6,7 +6,9 @@ #include <Framework/Deprecated/Viewport/WidgetViewport.h> #include <Applications/Wasm/StartupParametersBuilder.h> #include <Platforms/Wasm/WasmPlatformApplicationAdapter.h> +#include <Framework/StoneInitialization.h> #include <Core/Logging.h> +#include <sstream> #include <algorithm> @@ -105,7 +107,8 @@ } void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) { - + printf("Initializing Stone\n"); + OrthancStone::StoneInitialize(); printf("CreateWasmApplication\n"); application.reset(CreateUserApplication(broker));