# HG changeset patch # User Sebastien Jodogne # Date 1568197992 -7200 # Node ID f270852d3180a3a46a4824cb1ff9bbc9d438b959 # Parent a9f5d0742e225c31af38160bbbd6c8a60e257878# Parent 92a043b8e43153d8401988869a91ff93182b01f9 merge diff -r a9f5d0742e22 -r f270852d3180 Framework/Messages/IObserver.h --- 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); } diff -r a9f5d0742e22 -r f270852d3180 Platforms/Wasm/Defaults.cpp --- 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 #include #include +#include #include +#include #include @@ -105,7 +107,8 @@ } void EMSCRIPTEN_KEEPALIVE CreateWasmApplication(ViewportHandle viewport) { - + printf("Initializing Stone\n"); + OrthancStone::StoneInitialize(); printf("CreateWasmApplication\n"); application.reset(CreateUserApplication(broker));