From 6a9f135e1c5b743285aca48e5ffe69aba1428f7d Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 27 Jan 2015 08:11:37 -0800 Subject: [PATCH] Cleanup image clipping in ImageOverlay --- interface/src/ui/overlays/ImageOverlay.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/interface/src/ui/overlays/ImageOverlay.cpp b/interface/src/ui/overlays/ImageOverlay.cpp index 519e0c603d..0c5d9a7737 100644 --- a/interface/src/ui/overlays/ImageOverlay.cpp +++ b/interface/src/ui/overlays/ImageOverlay.cpp @@ -92,11 +92,9 @@ void ImageOverlay::render(RenderArgs* args) { QRect fromImage; if (_wantClipFromImage) { - fromImage = _fromImage; - float originalWidth = _texture->getOriginalWidth(); - float originalHeight = _texture->getOriginalHeight(); - float scaleX = imageWidth / originalWidth; - float scaleY = imageHeight / originalHeight; + float scaleX = imageWidth / _texture->getOriginalWidth(); + float scaleY = imageHeight / _texture->getOriginalHeight(); + fromImage.setX(scaleX * _fromImage.x()); fromImage.setY(scaleY * _fromImage.y()); fromImage.setWidth(scaleX * _fromImage.width());