[Libreoffice-commits] core.git: vcl/quartz

[Tor Lillqvist]

 vcl/quartz/salbmp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 633e5e16cd233cbb28b24527bb27bf5463ea7276
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Sep 3 19:01:30 2014 +0200

    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

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 2704dc4..a980510 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
         {