Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7bb7e992: Merge change Ia8ac904d into eclair

Browse Source 
Merge commit '7bb7e99216956d917af1786a3e02a92cac46fc84' into eclair-mr2

* commit '7bb7e99216956d917af1786a3e02a92cac46fc84':
  fix [2182249] [MR1] valgrind error in surface flinger
This commit is contained in:
Mathias Agopian
2009-10-16 14:33:01 -07:00
committed by Android Git Automerger
parent a486f554aa 7bb7e99216
commit fe50b63f9b
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/private/ui/RegionHelper.h
View File

@@ -86,7 +86,7 @@ public:
rasterizer(current); rasterizer(current);
} }
} }
} while(!spannerInner.isDone()); } while(!spannerInner.isDone());
} while(!spanner.isDone()); } while(!spanner.isDone());
} }
@@ -220,18 +220,21 @@ private:
} }
inline void prepare(int inside) { 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) { 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_head = max_value;
SpannerBase::rhs_tail = max_value; SpannerBase::rhs_tail = max_value;
} else if (inside == SpannerBase::lhs_after_rhs) { } else if (inside == SpannerBase::lhs_after_rhs) {
SpannerBase::lhs_head = max_value; SpannerBase::lhs_head = max_value;
SpannerBase::lhs_tail = max_value; SpannerBase::lhs_tail = max_value;
SpannerBase::rhs_head = rhs.rects->left + rhs.dx;
SpannerBase::rhs_tail = rhs.rects->right + rhs.dx;
} else { } 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;
} }
} }

7
libs/ui/tests/region.cpp
View File

@@ -25,9 +25,16 @@ using namespace android;
int main() int main()
{ {
Region empty;
Region reg0( Rect( 0, 0, 100, 100 ) ); Region reg0( Rect( 0, 0, 100, 100 ) );
Region reg1 = reg0; Region reg1 = reg0;
Region reg2, reg3; Region reg2, reg3;
Region reg4 = empty | reg1;
Region reg5 = reg1 | empty;
reg4.dump("reg4");
reg5.dump("reg5");
reg0.dump("reg0"); reg0.dump("reg0");
reg1.dump("reg1"); reg1.dump("reg1");