diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-30 15:02:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-30 15:02:04 -0700 |
| commit | b199d1145382afc0401e93ee4d6b79b852a97801 (patch) | |
| tree | 2ed24bb7681fa704a586a914ec13f5aa854125cc | |
| parent | d85545d0b4c92cceafafce98f246483de5c4903e (diff) | |
| parent | 9baef73c9b2ea17a4eba997c45e944ac6b9af835 (diff) | |
| download | frameworks_base-b199d1145382afc0401e93ee4d6b79b852a97801.zip frameworks_base-b199d1145382afc0401e93ee4d6b79b852a97801.tar.gz frameworks_base-b199d1145382afc0401e93ee4d6b79b852a97801.tar.bz2 | |
am 9baef73c: Merge change Id8b28e4f into eclair
Merge commit '9baef73c9b2ea17a4eba997c45e944ac6b9af835' into eclair-mr2
* commit '9baef73c9b2ea17a4eba997c45e944ac6b9af835':
fix [2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
| -rw-r--r-- | libs/surfaceflinger/LayerBlur.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/surfaceflinger/LayerBlur.cpp b/libs/surfaceflinger/LayerBlur.cpp index 744f2e9..5fd7904 100644 --- a/libs/surfaceflinger/LayerBlur.cpp +++ b/libs/surfaceflinger/LayerBlur.cpp @@ -40,9 +40,10 @@ const char* const LayerBlur::typeID = "LayerBlur"; LayerBlur::LayerBlur(SurfaceFlinger* flinger, DisplayID display, const sp<Client>& client, int32_t i) -: LayerBaseClient(flinger, display, client, i), mCacheDirty(true), -mRefreshCache(true), mCacheAge(0), mTextureName(-1U), -mWidthScale(1.0f), mHeightScale(1.0f) + : LayerBaseClient(flinger, display, client, i), mCacheDirty(true), + mRefreshCache(true), mCacheAge(0), mTextureName(-1U), + mWidthScale(1.0f), mHeightScale(1.0f), + mBlurFormat(GGL_PIXEL_FORMAT_RGB_565) { } |