summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-06-02 14:11:40 +0200
committerTor Lillqvist <tml@collabora.com>2016-06-06 11:03:23 +0000
commit5abd4093a64e0de74100c6b280bafa4b283e2aae (patch)
tree08a318024f914ac953a3a88939a9d5f45d19e91e
parent2aac7acd83c48daf4e0e06e6e4b8f7460b6391d1 (diff)
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 <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 80d7ed6dc3ddaa364e7be84b4dd7d1783802b8da) Reviewed-on: https://gerrit.libreoffice.org/25857 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Toma┼ż Vajngerl <quikee@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--vcl/source/filter/igif/gifread.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/filter/igif/gifread.cxx b/vcl/source/filter/igif/gifread.cxx
index 9b4d690e1115..083924c97bc4 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