diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-16 14:33:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-16 14:33:01 -0700 |
| commit | b02ee76cc797db50bff7684c17d826ebbefd423c (patch) | |
| tree | e070e853545dcb3aa2f3cda4f37b490f9e54c424 | |
| parent | 318ad9c1d9d6515026dfc2c021359d27decaa7a1 (diff) | |
| parent | 7b9d6a92534fd712c465b5ffcc4e7631f0147c1c (diff) | |
| download | frameworks_av-b02ee76cc797db50bff7684c17d826ebbefd423c.zip frameworks_av-b02ee76cc797db50bff7684c17d826ebbefd423c.tar.gz frameworks_av-b02ee76cc797db50bff7684c17d826ebbefd423c.tar.bz2 | |
am 7bb7e992: Merge change Ia8ac904d into eclair
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-mr2
* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
fix [2182249] [MR1] valgrind error in surface flinger
| -rw-r--r-- | include/private/ui/RegionHelper.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/private/ui/RegionHelper.h b/include/private/ui/RegionHelper.h index 926fddb..8d76533 100644 --- a/include/private/ui/RegionHelper.h +++ b/include/private/ui/RegionHelper.h @@ -86,7 +86,7 @@ public: rasterizer(current); } } - } while(!spannerInner.isDone()); + } while(!spannerInner.isDone()); } while(!spanner.isDone()); } @@ -220,18 +220,21 @@ private: } inline void prepare(int inside) { - SpannerBase::lhs_head = lhs.rects->left + lhs.dx; - SpannerBase::lhs_tail = lhs.rects->right + lhs.dx; - SpannerBase::rhs_head = rhs.rects->left + rhs.dx; - SpannerBase::rhs_tail = rhs.rects->right + rhs.dx; if (inside == SpannerBase::lhs_before_rhs) { + SpannerBase::lhs_head = lhs.rects->left + lhs.dx; + SpannerBase::lhs_tail = lhs.rects->right + lhs.dx; SpannerBase::rhs_head = max_value; SpannerBase::rhs_tail = max_value; } else if (inside == SpannerBase::lhs_after_rhs) { SpannerBase::lhs_head = max_value; SpannerBase::lhs_tail = max_value; + SpannerBase::rhs_head = rhs.rects->left + rhs.dx; + SpannerBase::rhs_tail = rhs.rects->right + rhs.dx; } else { - // use both spans + SpannerBase::lhs_head = lhs.rects->left + lhs.dx; + SpannerBase::lhs_tail = lhs.rects->right + lhs.dx; + SpannerBase::rhs_head = rhs.rects->left + rhs.dx; + SpannerBase::rhs_tail = rhs.rects->right + rhs.dx; } } |