diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 11:06:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 11:06:10 (GMT) |
| commit | ef83df9ea3ee0bc2d0fada72f5838b1e80d19f38 (patch) | |
| tree | 1a97a523dc62b653e7be642518fc416271bd2dbd /src | |
| parent | a41019035a0bed4e825d35bd3340c40524cec378 (diff) | |
| parent | ff9f3fc24c57254b150c1afba2e5883da8ed2b83 (diff) | |
| download | Qt-ef83df9ea3ee0bc2d0fada72f5838b1e80d19f38.zip Qt-ef83df9ea3ee0bc2d0fada72f5838b1e80d19f38.tar.gz Qt-ef83df9ea3ee0bc2d0fada72f5838b1e80d19f38.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent QRegion from crashing on large coordinates.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/painting/qregion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 614d2c0..bea2b6e 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -3134,8 +3134,8 @@ SOFTWARE. ************************************************************************/ /* $XFree86: xc/lib/X11/PolyReg.c,v 1.1.1.2.8.2 1998/10/04 15:22:49 hohndel Exp $ */ -#define LARGE_COORDINATE 1000000 -#define SMALL_COORDINATE -LARGE_COORDINATE +#define LARGE_COORDINATE INT_MAX +#define SMALL_COORDINATE INT_MIN /* * InsertEdgeInET |