summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-30 17:54:16 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-30 17:54:16 -0400
commit9baef73c9b2ea17a4eba997c45e944ac6b9af835 (patch)
tree8952ecb7c0fe6b116a751082387637f12241629f
parentd01767f8b7038108f9125cd2122b117db9919824 (diff)
parentd8b28e4fcddcacdbd2b69584a4e3aa12f52e8229 (diff)
downloadframeworks_base-9baef73c9b2ea17a4eba997c45e944ac6b9af835.zip
frameworks_base-9baef73c9b2ea17a4eba997c45e944ac6b9af835.tar.gz
frameworks_base-9baef73c9b2ea17a4eba997c45e944ac6b9af835.tar.bz2
Merge change Id8b28e4f into eclair
* changes: fix [2225964] Android runtime restarted in surfaceflinger/BlurFilter.cpp
-rw-r--r--libs/surfaceflinger/LayerBlur.cpp7
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)
{
}