# HG changeset patch # User Benjamin Golinvaux # Date 1557820001 -7200 # Node ID f1bfe3d1759ff2407f2e492752faf5c8fda7e922 # Parent b4fe9642e83b3858d881fabe3d8e3b786e163647 Moved RadiographyDicomLayer::SetDicomFrameConverter to cpp file to prevent using an auto_ptr with an incomplete type (because of Microsoft implementation?) because that might lead to the dtor not being called. diff -r b4fe9642e83b -r f1bfe3d1759f Framework/Radiography/RadiographyDicomLayer.cpp --- a/Framework/Radiography/RadiographyDicomLayer.cpp Mon May 13 15:22:08 2019 +0200 +++ b/Framework/Radiography/RadiographyDicomLayer.cpp Tue May 14 09:46:41 2019 +0200 @@ -106,6 +106,12 @@ BroadcastMessage(RadiographyLayer::LayerEditedMessage(*this)); } + + void RadiographyDicomLayer::SetDicomFrameConverter(DicomFrameConverter* converter) + { + converter_.reset(converter); + } + void RadiographyDicomLayer::Render(Orthanc::ImageAccessor& buffer, const AffineTransform2D& viewTransform, ImageInterpolation interpolation) const diff -r b4fe9642e83b -r f1bfe3d1759f Framework/Radiography/RadiographyDicomLayer.h --- a/Framework/Radiography/RadiographyDicomLayer.h Mon May 13 15:22:08 2019 +0200 +++ b/Framework/Radiography/RadiographyDicomLayer.h Tue May 14 09:46:41 2019 +0200 @@ -69,7 +69,9 @@ const Orthanc::ImageAccessor* GetSourceImage() const {return source_.get();} // currently need this access to serialize scene in plain old data to send to a WASM worker const DicomFrameConverter& GetDicomFrameConverter() const {return *converter_;} // currently need this access to serialize scene in plain old data to send to a WASM worker - void SetDicomFrameConverter(DicomFrameConverter* converter) {converter_.reset(converter);} // Takes ownership + + // Takes ownership + void SetDicomFrameConverter(DicomFrameConverter* converter); virtual void Render(Orthanc::ImageAccessor& buffer, const AffineTransform2D& viewTransform,