vcl/source/filter/igif/gifread.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5abd4093a64e0de74100c6b280bafa4b283e2aae
Author: Michael Stahl <mst...@redhat.com>
Date: Thu Jun 2 14:11:40 2016 +0200
vcl: GIF import: don't use __LP64__ to check for a 64-bit system
__LP64__ is not defined in MSVC AMD64 builds, since it doesn't have
64-bit longs. This caused the vcl_filters_test to fail because loading
the file for which that check is a work-around succeeded.
Change-Id: I4df48d4b196a1d08e9bd5ef61b64ec63501037c9
(cherry picked from commit f6ed2305abb0289ad51605ceeaee607a0bc8d7bd)
Reviewed-on: https://gerrit.libreoffice.org/25829
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
(cherry picked from commit 80d7ed6dc3ddaa364e7be84b4dd7d1783802b8da)
Reviewed-on: https://gerrit.libreoffice.org/25857
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/vcl/source/filter/igif/gifread.cxx
b/vcl/source/filter/igif/gifread.cxx
index 9b4d690..083924c 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -89,7 +89,7 @@ bool GIFReader::CreateBitmaps( long nWidth, long nHeight,
BitmapPalette* pPal,
{
const Size aSize( nWidth, nHeight );
-#ifdef __LP64__
+#if SAL_TYPES_SIZEOFPOINTER == 8
// Don't bother allocating a bitmap of a size that would fail on a
// 32-bit system. We have at least one unit tests that is expected
// to fail (loading a 65535*65535 size GIF
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
