diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 17:26:15 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-16 17:26:15 -0400 |
commit | 7bb7e99216956d917af1786a3e02a92cac46fc84 (patch) | |
tree | a18f9ff4056dad827b45b774b27d4a5f5d9c5027 /include/private/ui/RegionHelper.h | |
parent | 7f66dbcec37bdb154db0e7c95c73ecd257bc38c9 (diff) | |
parent | a8ac904d97a008b346390c87e74d44df39b0f320 (diff) | |
download | frameworks_base-7bb7e99216956d917af1786a3e02a92cac46fc84.zip frameworks_base-7bb7e99216956d917af1786a3e02a92cac46fc84.tar.gz frameworks_base-7bb7e99216956d917af1786a3e02a92cac46fc84.tar.bz2 |
Merge change Ia8ac904d into eclair
* changes:
fix [2182249] [MR1] valgrind error in surface flinger
Diffstat (limited to 'include/private/ui/RegionHelper.h')
-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; } } |