[Tizen] Prepare for Tizen 4.0 Build

[platform/core/uifw/dali-demo.git] / examples / atlas / atlas-example.cpp

diff --git a/examples/atlas/atlas-example.cpp b/examples/atlas/atlas-example.cpp
index a73bb25..503d577 100644 (file)
--- a/examples/atlas/atlas-example.cpp
+++ b/examples/atlas/atlas-example.cpp
@@ -28,10 +28,10 @@ class AtlasController;
 
 namespace
 {
-const char * const BACKGROUND_IMAGE( DALI_IMAGE_DIR "background-gradient.jpg" );
-const char * const TOOLBAR_IMAGE( DALI_IMAGE_DIR "top-bar.png" );
-const char * const LOSE_CONTEXT_IMAGE( DALI_IMAGE_DIR "icon-cluster-wobble.png" );
-const char * const LOSE_CONTEXT_IMAGE_SELECTED( DALI_IMAGE_DIR "icon-cluster-wobble-selected.png" );
+const char * const BACKGROUND_IMAGE( DEMO_IMAGE_DIR "background-gradient.jpg" );
+const char * const TOOLBAR_IMAGE( DEMO_IMAGE_DIR "top-bar.png" );
+const char * const LOSE_CONTEXT_IMAGE( DEMO_IMAGE_DIR "icon-cluster-wobble.png" );
+const char * const LOSE_CONTEXT_IMAGE_SELECTED( DEMO_IMAGE_DIR "icon-cluster-wobble-selected.png" );
 
 Application gApplication;
 AtlasController* gAtlasController(NULL);
@@ -79,28 +79,28 @@ public:
 
     mAtlas = Atlas::New( 400,700, Pixel::RGBA8888);
     mAtlas.Clear(Vector4(0.f,0.5f,0.5f,0.25f));
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-change.png", 50, 30 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-effects-on.png", 150, 30 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-cross.png", 100, 80 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-fold.png", 150, 80 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-effect-wave.png", 200, 80 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 );
-    mAtlas.Upload( DALI_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-change.png", 50, 30 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-cluster-carousel.png", 100, 30 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-effects-on.png", 150, 30 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-cross.png", 100, 80 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-fold.png", 150, 80 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-effect-wave.png", 200, 80 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-depth.png", 150, 130 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-grid.png", 200, 130 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "icon-item-view-layout-spiral.png", 250, 130 );
 
     UploadBufferImages();
     UploadPixelData();
 
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-1.jpg", 4, 304 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-2.jpg", 136, 304 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-3.jpg", 268, 304 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-4.jpg", 4, 436 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-5.jpg", 136, 436 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-6.jpg", 268, 436 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 4, 568 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 136, 568 );
-    mAtlas.Upload( DALI_IMAGE_DIR "gallery-small-7.jpg", 268, 568 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-1.jpg", 4, 304 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-2.jpg", 136, 304 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-3.jpg", 268, 304 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-4.jpg", 4, 436 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-5.jpg", 136, 436 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-6.jpg", 268, 436 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 4, 568 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 136, 568 );
+    mAtlas.Upload( DEMO_IMAGE_DIR "gallery-small-7.jpg", 268, 568 );
 
 
     Toolkit::ImageView imageView = Toolkit::ImageView::New( mAtlas );
@@ -200,18 +200,18 @@ 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];
+    unsigned int bufferSize = size * Pixel::GetBytesPerPixel(Pixel::RGB888);
+    unsigned char* pixels = new unsigned char [bufferSize];
     for( unsigned int i = 0; i < size; i++ )
     {
       pixels[i*3u] = 0xFF * color.x;
       pixels[i*3u+1u] = 0xFF * color.y;
       pixels[i*3u+2u] = 0xFF * color.z;
     }
-
-    return PixelData::New( pixels, width, height, Pixel::RGB888, PixelData::DELETE_ARRAY );
+    return PixelData::New( pixels, bufferSize, width, height, Pixel::RGB888, PixelData::DELETE_ARRAY );
   }
 
 
@@ -234,9 +234,9 @@ void RunTest( Application& application )
 
 // Entry point for Linux & Tizen applications
 //
-int main( int argc, char **argv )
+int DALI_EXPORT_API main( int argc, char **argv )
 {
-  gApplication = Application::New( &argc, &argv, DALI_DEMO_THEME_PATH );
+  gApplication = Application::New( &argc, &argv, DEMO_THEME_PATH );
 
   RunTest( gApplication );