diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 17:48:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-19 17:48:48 -0700 |
| commit | ba5372f8182ba64e0a48ef89f04be74f53fc5c0e (patch) | |
| tree | 3d622eaa1c789d79587d01e9ec59000c794f361f /libs/ui/Surface.cpp | |
| parent | b5f2ce6e2f3395fb944136d4d88aec4ac0783aca (diff) | |
| parent | 18b6b49ea5235fb6c0802db9a0cc2c6dd20646cb (diff) | |
| download | frameworks_base-ba5372f8182ba64e0a48ef89f04be74f53fc5c0e.zip frameworks_base-ba5372f8182ba64e0a48ef89f04be74f53fc5c0e.tar.gz frameworks_base-ba5372f8182ba64e0a48ef89f04be74f53fc5c0e.tar.bz2 | |
Merge change 22021 into eclair
* changes:
fix a bug that caused the PixelFormat viewed by Surface to be wrong.
Diffstat (limited to 'libs/ui/Surface.cpp')
| -rw-r--r-- | libs/ui/Surface.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp index 0ba0a65..36a10cf 100644 --- a/libs/ui/Surface.cpp +++ b/libs/ui/Surface.cpp @@ -197,7 +197,8 @@ SurfaceControl::SurfaceControl( uint32_t w, uint32_t h, PixelFormat format, uint32_t flags) : mClient(client), mSurface(surface), mToken(data.token), mIdentity(data.identity), - mWidth(w), mHeight(h), mFormat(format), mFlags(flags) + mWidth(data.width), mHeight(data.height), mFormat(data.format), + mFlags(flags) { } |