diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-13 00:11:54 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-13 00:11:54 +0000 |
| commit | b8ee17c89b64f9ab759f6b8aafda9046c4f34c88 (patch) | |
| tree | 27adf7b36ae94d7e2d94dff5429ff63045f1a5e7 /skia/effects | |
| parent | 6892170a2019fee4d7379327da4e4ca3810352db (diff) | |
| download | chromium_src-b8ee17c89b64f9ab759f6b8aafda9046c4f34c88.zip chromium_src-b8ee17c89b64f9ab759f6b8aafda9046c4f34c88.tar.gz chromium_src-b8ee17c89b64f9ab759f6b8aafda9046c4f34c88.tar.bz2 | |
Linux: GCC 4.3 warning fixes
The lastest Skia drop included some code which triggers warnings with GCC 4.3
Review URL: http://codereview.chromium.org/14097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/effects')
| -rw-r--r-- | skia/effects/SkCullPoints.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/skia/effects/SkCullPoints.cpp b/skia/effects/SkCullPoints.cpp index 23d00b6..2c65d5a 100644 --- a/skia/effects/SkCullPoints.cpp +++ b/skia/effects/SkCullPoints.cpp @@ -36,10 +36,10 @@ bool SkCullPoints::sect_test(int x0, int y0, int x1, int y1) const { const SkIRect& r = fR; - if (x0 < r.fLeft && x1 < r.fLeft || - x0 > r.fRight && x1 > r.fRight || - y0 < r.fTop && y1 < r.fTop || - y0 > r.fBottom && y1 > r.fBottom) + if ((x0 < r.fLeft && x1 < r.fLeft) || + (x0 > r.fRight && x1 > r.fRight) || + (y0 < r.fTop && y1 < r.fTop) || + (y0 > r.fBottom && y1 > r.fBottom)) return false; // since the crossprod test is a little expensive, check for easy-in cases first |