From cde18c8978d2c680dbee88159246024960cdc705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> Date: Sat, 27 Nov 2010 16:28:14 +0000 Subject: [PATCH] Resolves: rhbz#657628# divide by zero --- extensions/source/scanner/sanedlg.cxx | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 159c8af..98c6546 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -744,21 +744,23 @@ maReslBox.SetValue( (ULONG)fResl ); if( mbDragEnable ) + { maPreviewRect = Rectangle( maTopLeft, Size( maBottomRight.X() - maTopLeft.X(), maBottomRight.Y() - maTopLeft.Y() ) ); + } else { Size aBMSize( maPreviewBitmap.GetSizePixel() ); - if( aBMSize.Width() > aBMSize.Height() ) + if( aBMSize.Width() > aBMSize.Height() && aBMSize.Width() ) { int nVHeight = (maBottomRight.X() - maTopLeft.X()) * aBMSize.Height() / aBMSize.Width(); maPreviewRect = Rectangle( Point( maTopLeft.X(), ( maTopLeft.Y() + maBottomRight.Y() )/2 - nVHeight/2 ), Size( maBottomRight.X() - maTopLeft.X(), nVHeight ) ); } - else + else if (aBMSize.Height()) { int nVWidth = (maBottomRight.Y() - maTopLeft.Y()) * aBMSize.Width() / aBMSize.Height(); maPreviewRect = Rectangle( Point( ( maTopLeft.X() + maBottomRight.X() )/2 - nVWidth/2, maTopLeft.Y() ),