diff options
author | Mathias Agopian <mathias@google.com> | 2009-10-15 18:08:15 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-10-15 18:08:15 -0700 |
commit | a8ac904d97a008b346390c87e74d44df39b0f320 (patch) | |
tree | 542fe7fccb07a5d9f380c9d169680d38a4f5f445 /include | |
parent | 53f33d84776a0bad668e361365a7049b16f8a929 (diff) | |
download | frameworks_base-a8ac904d97a008b346390c87e74d44df39b0f320.zip frameworks_base-a8ac904d97a008b346390c87e74d44df39b0f320.tar.gz frameworks_base-a8ac904d97a008b346390c87e74d44df39b0f320.tar.bz2 |
fix [2182249] [MR1] valgrind error in surface flinger
Diffstat (limited to 'include')
-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; } } |