Commit 01842cc0ba65f1e917267d244747d68e5426b499
[dali_1.1.38] Merge branch 'devel/master'
Change-Id: Ie995ce8342cd34be613210b0934b43a51cf77600
Showing
2 changed files
with
2 additions
and
2 deletions
examples/atlas/atlas-example.cpp
| @@ -200,7 +200,7 @@ private: | @@ -200,7 +200,7 @@ private: | ||
| 200 | return imageData; | 200 | return imageData; |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | - PixelDataPtr CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height ) | 203 | + PixelData CreatePixelData( const Vector3& color, const unsigned int width, const unsigned int height ) |
| 204 | { | 204 | { |
| 205 | unsigned int size = width*height; | 205 | unsigned int size = width*height; |
| 206 | unsigned char* pixels = new unsigned char [size*3u]; | 206 | unsigned char* pixels = new unsigned char [size*3u]; |
packaging/com.samsung.dali-demo.spec
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | Name: com.samsung.dali-demo | 3 | Name: com.samsung.dali-demo |
| 4 | Summary: The OpenGLES Canvas Core Demo | 4 | Summary: The OpenGLES Canvas Core Demo |
| 5 | -Version: 1.1.37 | 5 | +Version: 1.1.38 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Group: System/Libraries | 7 | Group: System/Libraries |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |