From 4b256768372e42ac2d7b97f8722e1b41259ba869 Mon Sep 17 00:00:00 2001 From: Francisco Santos Date: Wed, 18 Jan 2017 18:55:25 +0000 Subject: [PATCH 1/1] Add assert to ensure initialized variables. Change-Id: I46b75f9d7b6dd18aefebce845acbb7a46d258ffc --- dali-toolkit/internal/image-loader/atlas-packer.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dali-toolkit/internal/image-loader/atlas-packer.cpp b/dali-toolkit/internal/image-loader/atlas-packer.cpp index e02eba6..26ad3e0 100644 --- a/dali-toolkit/internal/image-loader/atlas-packer.cpp +++ b/dali-toolkit/internal/image-loader/atlas-packer.cpp @@ -258,12 +258,11 @@ void AtlasPacker::GrowPack( SizeType blockWidth, SizeType blockHeight, firstFit = InsertNode( mRoot->child[1], blockWidth, blockHeight ); } - if( firstFit != NULL ) - { - firstFit->occupied = true; - packPositionX = firstFit->rectArea.x; - packPositionY = firstFit->rectArea.y; - } + DALI_ASSERT_ALWAYS( firstFit != NULL && "It should never happen!") + + firstFit->occupied = true; + packPositionX = firstFit->rectArea.x; + packPositionY = firstFit->rectArea.y; } void AtlasPacker::GrowNode( SizeType blockWidth, SizeType blockHeight ) -- 2.7.4