diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-09-03 19:01:30 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-23 09:50:33 +0300 |
| commit | 39409db7cde46d0aad9e0f61dfda085cff1235a0 (patch) | |
| tree | fbdcfdf80ecef6715ad20280706f7cbffe1227e3 /vcl | |
| parent | 7923c53ac55976fb5c176ece77163963a452d520 (diff) | |
What is a ridiculous size in 32-bit code is also ridiculous in 64-bit code
Avoids the CppunitTest_vcl_filters_test allocating an insane amount of
memory when run as 64-bit on OS X.
Change-Id: I978347849c2cf5fd1663e5a85a788b736e239e94
(cherry picked from commit 633e5e16cd233cbb28b24527bb27bf5463ea7276)
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/quartz/salbmp.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 2704dc428da3..a9805100d907 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -303,7 +303,7 @@ bool QuartzSalBitmap::AllocateUserData() bool alloc = false; if (mnBytesPerRow != 0 - && mnBytesPerRow <= std::numeric_limits<std::size_t>::max() / mnHeight) + && mnBytesPerRow <= std::numeric_limits<sal_uInt32>::max() / mnHeight) { try { |