diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-04-18 20:57:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-04-22 21:48:32 +0200 |
| commit | 10e38e72f4f940bf7bbf9865d76c17a731c3200b (patch) | |
| tree | 550b59bb9bcffc8ad6bc6c313f41d818d2a5ab24 | |
| parent | 67702f2451f3132c93339c3471228c716c2ba02d (diff) | |
fdo#77088 WMF - replace 32-bit min/max assumption with const
Added RECT_MIN and RECT_MAX which represent the minimum and
maximum value a Rectangle object can hold. In WMF we used a 32-bit
assumption what the min and max value could be (0x7fffffff,
0x80000000) which causes problems on 64-bit systems.
Change-Id: Ic62daebbc2708cdeb7b0cf7b694bd9940eb98313
(cherry picked from commit fa632a57b7fcbc0a790fc6615174f25b7f640713)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | include/tools/gen.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/filter/wmf/winwmf.cxx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx index 39860582cfbe..bba8bae41320 100644 --- a/include/tools/gen.hxx +++ b/include/tools/gen.hxx @@ -355,6 +355,8 @@ inline std::basic_ostream<charT, traits> & operator <<( // Rectangle #define RECT_EMPTY ((short)-32767) +#define RECT_MAX LONG_MAX +#define RECT_MIN LONG_MIN class TOOLS_DLLPUBLIC SAL_WARN_UNUSED Rectangle { diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index f3cfaf2d2817..1ae9047e7e0d 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -1272,10 +1272,10 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt { sal_Bool bRet = sal_True; - rPlaceableBound.Left() = (sal_Int32)0x7fffffff; - rPlaceableBound.Top() = (sal_Int32)0x7fffffff; - rPlaceableBound.Right() = (sal_Int32)0x80000000; - rPlaceableBound.Bottom() = (sal_Int32)0x80000000; + rPlaceableBound.Left() = RECT_MAX; + rPlaceableBound.Top() = RECT_MAX; + rPlaceableBound.Right() = RECT_MIN; + rPlaceableBound.Bottom() = RECT_MIN; sal_uInt32 nPos = pStm->Tell(); sal_uInt32 nEnd = pStm->Seek( STREAM_SEEK_TO_END ); |