From d7cf6729dbfeeca1c9d46bbf494da440749cf93f Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 16 Nov 2016 14:23:33 +0000 Subject: [PATCH] More SVACE fixes Change-Id: I3f912024ba53d612af0a41141b4afa64c79d7ad1 --- dali-toolkit/internal/visuals/transition-data-impl.cpp | 2 +- .../public-api/controls/scrollable/item-view/item-layout.h | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dali-toolkit/internal/visuals/transition-data-impl.cpp b/dali-toolkit/internal/visuals/transition-data-impl.cpp index 8ccb354..a91b8ab 100644 --- a/dali-toolkit/internal/visuals/transition-data-impl.cpp +++ b/dali-toolkit/internal/visuals/transition-data-impl.cpp @@ -174,7 +174,7 @@ TransitionData::Animator* TransitionData::ConvertMap( const Property::Map& map) bool valid = true; Vector4 controlPoints; Property::Array *array = value.GetArray(); - if( array->Count() >= 4 ) + if( array && array->Count() >= 4 ) { for( size_t vecIdx = 0; vecIdx < 4; ++vecIdx ) { diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h index e013196..e9c5068 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_ITEM_LAYOUT_H__ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -79,8 +79,11 @@ struct ItemRange */ ItemRange& operator=(const ItemRange& range) { - begin = range.begin; - end = range.end; + if( this != &range ) + { + begin = range.begin; + end = range.end; + } return *this; } -- 2.7.4