From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Fri, 3 Jun 2016 16:13:24 +0000 (-0700)
Subject: Merge "Updata Atlas example following the PixelData change" into devel/master
X-Git-Tag: dali_1.1.38~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd044f4f5749fc198065cf2c487bee25eff9dd18;hp=53e919933f971f9fbb4d8ab797a7f3da5a79e621;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

Merge "Updata Atlas example following the PixelData change" into devel/master
---

diff --git a/examples/atlas/atlas-example.cpp b/examples/atlas/atlas-example.cpp
index 3ba64ea..1d0f089 100644
--- a/examples/atlas/atlas-example.cpp
+++ b/examples/atlas/atlas-example.cpp
@@ -200,7 +200,7 @@ private:
     return imageData;
   }
 
-  PixelDataPtr CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height )
+  PixelData CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height )
   {
     unsigned int size = width*height;
     unsigned char* pixels = new unsigned char [size*3u];