# HG changeset patch # User Sebastien Jodogne # Date 1532635615 -7200 # Node ID 57e2d65d37ce889e23dd2be677c49b03beefa798 # Parent d015fa861e3c5ad404966063df51013e74ae1b85 OrthancPlugins::MemoryBuffer::Release(), fixing openssl link diff -r d015fa861e3c -r 57e2d65d37ce Plugins/Samples/Common/OrthancPluginCppWrapper.cpp --- a/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp Thu Jul 26 21:18:05 2018 +0200 +++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp Thu Jul 26 22:06:55 2018 +0200 @@ -107,6 +107,17 @@ } + OrthancPluginMemoryBuffer MemoryBuffer::Release() + { + OrthancPluginMemoryBuffer result = buffer_; + + buffer_.data = NULL; + buffer_.size = 0; + + return result; + } + + void MemoryBuffer::ToString(std::string& target) const { if (buffer_.size == 0) diff -r d015fa861e3c -r 57e2d65d37ce Plugins/Samples/Common/OrthancPluginCppWrapper.h --- a/Plugins/Samples/Common/OrthancPluginCppWrapper.h Thu Jul 26 21:18:05 2018 +0200 +++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.h Thu Jul 26 22:06:55 2018 +0200 @@ -92,9 +92,11 @@ return &buffer_; } - // This transfers ownership + // This transfers ownership from "other" to "this" void Assign(OrthancPluginMemoryBuffer& other); + OrthancPluginMemoryBuffer Release(); + const char* GetData() const { if (buffer_.size > 0) diff -r d015fa861e3c -r 57e2d65d37ce Resources/CMake/OpenSslConfiguration.cmake --- a/Resources/CMake/OpenSslConfiguration.cmake Thu Jul 26 21:18:05 2018 +0200 +++ b/Resources/CMake/OpenSslConfiguration.cmake Thu Jul 26 22:06:55 2018 +0200 @@ -312,6 +312,7 @@ ${OPENSSL_SOURCES_DIR}/ssl/bad_dtls_test.c ${OPENSSL_SOURCES_DIR}/ssl/clienthellotest.c ${OPENSSL_SOURCES_DIR}/ssl/sslv2conftest.c + ${OPENSSL_SOURCES_DIR}/crypto/ec/ecp_nistz256.c ${OPENSSL_SOURCES_DIR}/crypto/ec/ecp_nistz256_table.c )