From c303d41df508002fb3074d4c2b30cc0c95203be1 Mon Sep 17 00:00:00 2001 From: "jonghyun.ho" Date: Tue, 24 Jun 2014 17:06:36 +0900 Subject: [PATCH] Remove valgrind warning of SuperBlurView Change-Id: I73d81f484f8fe8c22f5796adf746e9b03540dd8c Signed-off-by: Adeel Kazmi --- .../controls/gaussian-blur-view/gaussian-blur-view-impl.cpp | 2 ++ .../internal/controls/super-blur-view/super-blur-view-impl.cpp | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp index 0db5d57..75b537f 100644 --- a/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp +++ b/optional/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.cpp @@ -114,12 +114,14 @@ const char* const GAUSSIAN_BLUR_FRAGMENT_SOURCE = GaussianBlurView::GaussianBlurView() : Control( CONTROL_BEHAVIOUR_NONE ) , mNumSamples(GAUSSIAN_BLUR_VIEW_DEFAULT_NUM_SAMPLES) + , mBlurBellCurveWidth( 0.001f ) , mPixelFormat(GAUSSIAN_BLUR_VIEW_DEFAULT_RENDER_TARGET_PIXEL_FORMAT) , mDownsampleWidthScale(GAUSSIAN_BLUR_VIEW_DEFAULT_DOWNSAMPLE_WIDTH_SCALE) , mDownsampleHeightScale(GAUSSIAN_BLUR_VIEW_DEFAULT_DOWNSAMPLE_HEIGHT_SCALE) , mDownsampledWidth( 0.0f ) , mDownsampledHeight( 0.0f ) , mBlurUserImage( false ) + , mRenderOnce( false ) , mBackgroundColor( Color::BLACK ) , mTargetSize(Vector2::ZERO) , mLastSize(Vector2::ZERO) diff --git a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp index 7a75487..2681cbf 100644 --- a/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp +++ b/optional/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp @@ -105,9 +105,9 @@ SuperBlurView::SuperBlurView( unsigned int blurLevels ) mTargetSize( Vector2::ZERO ) { DALI_ASSERT_ALWAYS( mBlurLevels > 0 && " Minimal blur level is one, otherwise no blur is needed" ); - mGaussianBlurView.resize( blurLevels ); - mBlurredImage.resize( blurLevels ); - mImageActors.resize( blurLevels + 1 ); + mGaussianBlurView.assign( blurLevels, NULL ); + mBlurredImage.assign( blurLevels, FrameBufferImage() ); + mImageActors.assign( blurLevels + 1, ImageActor() ); } SuperBlurView::~SuperBlurView() -- 2.7.4