# HG changeset patch # User Alain Mazy # Date 1570480644 -7200 # Node ID 3a35d83975591031da2dc0ab5c579e9fad12fde6 # Parent 692291406f6a7f8ad312393a1a02aaa153c4de20# Parent 4e713ef78a5ac75b3c2b04e3d750b5320e97596e merge diff -r 4e713ef78a5a -r 3a35d8397559 Framework/Radiography/RadiographyScene.h --- a/Framework/Radiography/RadiographyScene.h Mon Oct 07 18:01:03 2019 +0200 +++ b/Framework/Radiography/RadiographyScene.h Mon Oct 07 22:37:24 2019 +0200 @@ -263,9 +263,9 @@ Extent2D GetSceneExtent() const; - void Render(Orthanc::ImageAccessor& buffer, - const AffineTransform2D& viewTransform, - ImageInterpolation interpolation) const; + virtual void Render(Orthanc::ImageAccessor& buffer, + const AffineTransform2D& viewTransform, + ImageInterpolation interpolation) const; bool LookupLayer(size_t& index /* out */, double x, diff -r 4e713ef78a5a -r 3a35d8397559 Framework/Toolbox/AffineTransform2D.h --- a/Framework/Toolbox/AffineTransform2D.h Mon Oct 07 18:01:03 2019 +0200 +++ b/Framework/Toolbox/AffineTransform2D.h Mon Oct 07 22:37:24 2019 +0200 @@ -77,6 +77,7 @@ const AffineTransform2D& c, const AffineTransform2D& d); + // transformations are applied right to left: e is the first transfo applied, a is the last one static AffineTransform2D Combine(const AffineTransform2D& a, const AffineTransform2D& b, const AffineTransform2D& c,