Mercurial > hg > orthanc-stone
changeset 1039:3a35d8397559
merge
author | Alain Mazy <alain@mazy.be> |
---|---|
date | Mon, 07 Oct 2019 22:37:24 +0200 |
parents | 692291406f6a (diff) 4e713ef78a5a (current diff) |
children | 14c0a29cd9ec 08cdcadfab14 |
files | |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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,
--- 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,