cppcanvas/source/mtfrenderer/implrenderer.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 9183e2cec024c28fb26f9f9f83530bd002d539c9
Author: jan iversen <j...@documentfoundation.org>
Date: Tue Oct 25 08:29:47 2016 +0000
Revert "tdf#96505 Get rid of cargo cult "long" integer literals"
This partly reverts commit 8ae33b1652cb1e654c426350169d3bb9fa031a4f.
Added a comment why 1L is needed in this file.
Change-Id: I92349b42decb964a45d4dc9c50b89cd22766acb9
Reviewed-on: https://gerrit.libreoffice.org/30259
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 2a2bcc2..0e41235 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1577,8 +1577,10 @@ namespace cppcanvas
// #i44110# correct null-sized output - there
// are metafiles which have zero size in at
// least one dimension
- const Size aMtfSizePix( ::std::max(
(int)aMtfSizePixPre.Width(), 1 ),
- ::std::max(
(int)aMtfSizePixPre.Height(), 1 ) );
+
+ // Remark the 1L cannot be replaced, that would cause
max to compare long/int
+ const Size aMtfSizePix( ::std::max(
aMtfSizePixPre.Width(), 1L ),
+ ::std::max(
aMtfSizePixPre.Height(), 1L ) );
// Setup local transform, such that the
// metafile renders itself into the given
@@ -2914,8 +2916,9 @@ namespace cppcanvas
// #i44110# correct null-sized output - there are shapes
// which have zero size in at least one dimension
- const Size aMtfSizePix( ::std::max( (int)aMtfSizePixPre.Width(), 1
),
- ::std::max( (int)aMtfSizePixPre.Height(),
1 ) );
+ // Remark the 1L cannot be replaced, that would cause max to
compare long/int
+ const Size aMtfSizePix( ::std::max( aMtfSizePixPre.Width(), 1L ),
+ ::std::max( aMtfSizePixPre.Height(), 1L )
);
sal_Int32 nCurrActions(0);
ActionFactoryParameters aParms(aStateStack,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
