summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2025-01-13 09:56:35 +0100
committerMike Kaganski <mike.kaganski@collabora.com>2025-01-13 12:07:17 +0100
commitbf7b45c2dea9fda943b3878e25d051ec1c5b19fa (patch)
tree1e0731b97156f94c0605dba9ab51666d1ccfcc87 /extensions
parent444179c7e14d1d0d1ffadd905a6c7c5961ce6e6d (diff)
Use o3tl::convert
Change-Id: Ie877cbee77752aaa30346c78b4f5b836f0ec44d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180161 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/scanner/sane.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index e1fde5e5213c..22bada4517c6 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -21,6 +21,7 @@
#include <math.h>
#include <o3tl/safeint.hxx>
+#include <o3tl/unit_conversion.hxx>
#include <osl/file.h>
#include <sal/log.hxx>
#include <tools/stream.hxx>
@@ -747,9 +748,9 @@ bool Sane::Start( BitmapTransporter& rBitmap )
if( ! fResl )
fResl = 300; // if all else fails that's a good guess
if( ! nWidthMM )
- nWidthMM = static_cast<int>((static_cast<double>(nWidth) / fResl) * 25.4);
+ nWidthMM = o3tl::convert(nWidth / fResl, o3tl::Length::in, o3tl::Length::mm);
if( ! nHeightMM )
- nHeightMM = static_cast<int>((static_cast<double>(nHeight) / fResl) * 25.4);
+ nHeightMM = o3tl::convert(nHeight / fResl, o3tl::Length::in, o3tl::Length::mm);
SAL_INFO("extensions.scanner", "set dimensions to(" << nWidth << ", " << nHeight << ") Pixel, (" << nWidthMM << ", " << nHeightMM <<
") mm, resolution is " << fResl);