emfio/source/reader/mtftools.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
New commits: commit 38e5169db360245daa9b9499589609cd80723f94 Author: Caolán McNamara <caol...@redhat.com> Date: Thu Oct 26 10:54:29 2017 +0100 ofz#3823 Integer-overflow Change-Id: Idb8ba0972dbfe2cf6ec43caef9b6984851f8f7ca Reviewed-on: https://gerrit.libreoffice.org/43878 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 038000e9a185..3693fe376dcc 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -488,7 +488,7 @@ namespace emfio break; } } - return Size( FRound( fWidth ), FRound( fHeight ) ); + return Size(basegfx::fround(fWidth), basegfx::fround(fHeight)); } else return Size(); @@ -1975,10 +1975,10 @@ namespace emfio } } - void MtfTools::ScaleDevExt( double fX, double fY ) + void MtfTools::ScaleDevExt(double fX, double fY) { - mnDevWidth = FRound( mnDevWidth * fX ); - mnDevHeight = FRound( mnDevHeight * fY ); + mnDevWidth = basegfx::fround(mnDevWidth * fX); + mnDevHeight = basegfx::fround(mnDevHeight * fY); } void MtfTools::SetWinOrg( const Point& rPoint , bool bIsEMF) @@ -2033,10 +2033,10 @@ namespace emfio } } - void MtfTools::ScaleWinExt( double fX, double fY ) + void MtfTools::ScaleWinExt(double fX, double fY) { - mnWinExtX = FRound( mnWinExtX * fX ); - mnWinExtY = FRound( mnWinExtY * fY ); + mnWinExtX = basegfx::fround(mnWinExtX * fX); + mnWinExtY = basegfx::fround(mnWinExtY * fY); } void MtfTools::SetrclBounds( const tools::Rectangle& rRect )
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits