diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-10 10:57:05 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-03-10 10:57:05 +0000 |
| commit | b5c4e7fd3866bbe30d7ea4d7bc463da5a70970e2 (patch) | |
| tree | 1348a14b7c5edf6d71960411b9c05defbac1f57b /libs/hwui/Patch.h | |
| parent | df897d08cebb013795ae679eef842a38b5153252 (diff) | |
| parent | 92860a74c6e57fb66b28afe95c13e7c0f97f831e (diff) | |
| download | frameworks_base-b5c4e7fd3866bbe30d7ea4d7bc463da5a70970e2.zip frameworks_base-b5c4e7fd3866bbe30d7ea4d7bc463da5a70970e2.tar.gz frameworks_base-b5c4e7fd3866bbe30d7ea4d7bc463da5a70970e2.tar.bz2 | |
resolved conflicts for merge of 92860a74 to master
Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
Diffstat (limited to 'libs/hwui/Patch.h')
| -rw-r--r-- | libs/hwui/Patch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/Patch.h b/libs/hwui/Patch.h index 489064b..1ba045d 100644 --- a/libs/hwui/Patch.h +++ b/libs/hwui/Patch.h @@ -67,7 +67,7 @@ private: void generateQuad(TextureVertex*& vertex, float x1, float y1, float x2, float y2, float u1, float v1, float u2, float v2, uint32_t& quadCount); - uint32_t* mColors; + const uint32_t* mColors; UvMapper mUvMapper; }; // struct Patch |