From ae3b2d5af29bd1116067c8c235e91af9d3e2b98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 3 Jul 2006 22:51:57 +0000 Subject: [PATCH] reverting part of previous change, this was breaking the working part of scaling, still some bugs though git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18019 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/drawing/Painter/Painter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/servers/app/drawing/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp index 6bb9b89ec2..d2597d726e 100644 --- a/src/servers/app/drawing/Painter/Painter.cpp +++ b/src/servers/app/drawing/Painter/Painter.cpp @@ -1327,6 +1327,12 @@ Painter::_DrawBitmap(agg::rendering_buffer& srcBuffer, color_space format, if (!fSubpixelPrecise) align_rect_to_pixels(&viewRect); + + double xScale = (viewRect.Width() + 1) / (bitmapRect.Width() + 1); + double yScale = (viewRect.Height() + 1) / (bitmapRect.Height() + 1); + + if (xScale == 0.0 || yScale == 0.0) + return; // compensate for the lefttop offset the actualBitmapRect might have // actualBitmapRect has the right size, but put it at B_ORIGIN @@ -1356,12 +1362,6 @@ Painter::_DrawBitmap(agg::rendering_buffer& srcBuffer, color_space format, bitmapRect.bottom = actualBitmapRect.bottom; } - double xScale = (viewRect.Width() + 1) / (bitmapRect.Width() + 1); - double yScale = (viewRect.Height() + 1) / (bitmapRect.Height() + 1); - - if (xScale == 0.0 || yScale == 0.0) - return; - double xOffset = viewRect.left - bitmapRect.left; double yOffset = viewRect.top - bitmapRect.top;