Updates following the PixelData change

Change-Id: Id5274bf0e4da9a4b7c3f4be2f79829065ac29f91

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
index 3acafbd..1315e53 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
@@ -68,12 +68,12 @@ public:
     unsigned char* buffer = static_cast<unsigned char*>(malloc(bufferSize));
     memset(buffer, 0, bufferSize);
 
-    mPixelData = PixelData::New( buffer, mSize.GetWidth(), mSize.GetHeight(), Pixel::RGBA8888, PixelData::FREE);
+    mPixelData = Dali::PixelData::New( buffer, mSize.GetWidth(), mSize.GetHeight(), Pixel::RGBA8888, Dali::PixelData::FREE);
 
     sem_post( &mySemaphore );
   }
 
-  PixelDataPtr GetPixelData() const
+  Dali::PixelData GetPixelData() const
   {
     return mPixelData;
   }
@@ -98,7 +98,7 @@ public:
   }
 
   ImageDimensions mSize;
-  PixelDataPtr mPixelData;
+  Dali::PixelData mPixelData;
   const std::string mUrl;
   sem_t mySemaphore;
 };
@@ -150,7 +150,7 @@ void Dali::BitmapLoader::Load()
 {
   GetImplementation(*this).Load();
 }
-PixelDataPtr Dali::BitmapLoader::GetPixelData() const
+PixelData Dali::BitmapLoader::GetPixelData() const
 {
   return GetImplementation(*this).GetPixelData();
 }

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h
index 141903b..6b2c94a 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.h
@@ -50,7 +50,7 @@ public:
   void Load();
   bool IsLoaded();
   std::string GetUrl() const;
-  PixelDataPtr GetPixelData() const;
+  PixelData GetPixelData() const;
 
   void WaitForLoading();
   static BitmapLoader GetLatestCreated(); // return the latest created BitmapLoader

diff --git a/dali-toolkit/devel-api/image-atlas/image-atlas.cpp b/dali-toolkit/devel-api/image-atlas/image-atlas.cpp
index 71b67ea..0c4a463 100644 (file)
--- a/dali-toolkit/devel-api/image-atlas/image-atlas.cpp
+++ b/dali-toolkit/devel-api/image-atlas/image-atlas.cpp
@@ -77,7 +77,7 @@ bool ImageAtlas::Upload( Vector4& textureRect,
   return GetImplementation(*this).Upload( textureRect, url, size, fittingMode, orientationCorrection );
 }
 
-bool ImageAtlas::Upload( Vector4& textureRect, PixelDataPtr pixelData )
+bool ImageAtlas::Upload( Vector4& textureRect, PixelData pixelData )
 {
   return GetImplementation(*this).Upload( textureRect, pixelData );
 }

diff --git a/dali-toolkit/devel-api/image-atlas/image-atlas.h b/dali-toolkit/devel-api/image-atlas/image-atlas.h
index 395615d..5ef9195 100644 (file)
--- a/dali-toolkit/devel-api/image-atlas/image-atlas.h
+++ b/dali-toolkit/devel-api/image-atlas/image-atlas.h
@@ -133,7 +133,7 @@ public:
    * @param [out] textureRect The texture area of the resource image in the atlas.
    * @param [in] pixelData The pixel data.
    */
-  bool Upload( Vector4& textureRect, PixelDataPtr pixelData );
+  bool Upload( Vector4& textureRect, PixelData pixelData );
 
   /**
    * @brief Remove the image at the given rectangle.

diff --git a/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp b/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp
index 03eb4a7..ab8ff18 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp
+++ b/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp
@@ -83,13 +83,13 @@ TextureSet ImageAtlasManager::Add( Vector4& textureRect,
 }
 
 TextureSet ImageAtlasManager::Add( Vector4& textureRect,
-                                 PixelDataPtr pixelData )
+                                 PixelData pixelData )
 {
 
   // big buffer, atlasing is not applied
-  if( static_cast<uint32_t>(pixelData->GetWidth()) * static_cast<uint32_t>(pixelData->GetHeight()) > MAX_ITEM_AREA
-      || pixelData->GetWidth()>DEFAULT_ATLAS_SIZE
-      || pixelData->GetHeight()>DEFAULT_ATLAS_SIZE )
+  if( static_cast<uint32_t>(pixelData.GetWidth()) * static_cast<uint32_t>(pixelData.GetHeight()) > MAX_ITEM_AREA
+      || pixelData.GetWidth()>DEFAULT_ATLAS_SIZE
+      || pixelData.GetHeight()>DEFAULT_ATLAS_SIZE )
   {
     return TextureSet();
   }

diff --git a/dali-toolkit/internal/controls/renderers/image-atlas-manager.h b/dali-toolkit/internal/controls/renderers/image-atlas-manager.h
index e191351..abe0123 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image-atlas-manager.h
+++ b/dali-toolkit/internal/controls/renderers/image-atlas-manager.h
@@ -81,7 +81,7 @@ public:
    * @return The texture set containing the image.
    */
   TextureSet Add( Vector4& textureRect,
-                PixelDataPtr pixelData );
+                  PixelData pixelData );
 
   /**
    * Remove the image at the given rectangle from the texture set.

diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
index af155f7..434eecf 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
@@ -443,7 +443,7 @@ Image ImageRenderer::LoadImage( const std::string& url, bool synchronousLoading
       // use broken image
       return RendererFactory::GetBrokenRendererImage();
     }
-    Atlas image = Atlas::New( mPixels->GetWidth(), mPixels->GetHeight(), mPixels->GetPixelFormat() );
+    Atlas image = Atlas::New( mPixels.GetWidth(), mPixels.GetHeight(), mPixels.GetPixelFormat() );
     image.Upload( mPixels, 0, 0 );
     return image;
   }
@@ -472,7 +472,7 @@ TextureSet ImageRenderer::CreateTextureSet( Vector4& textureRect, const std::str
       textureSet = mAtlasManager.Add(textureRect, mPixels );
       if( !textureSet ) // big image, no atlasing
       {
-        Atlas image = Atlas::New( mPixels->GetWidth(), mPixels->GetHeight(), mPixels->GetPixelFormat() );
+        Atlas image = Atlas::New( mPixels.GetWidth(), mPixels.GetHeight(), mPixels.GetPixelFormat() );
         image.Upload( mPixels, 0, 0 );
         textureSet = TextureSet::New();
         textureSet.SetImage( 0u, image );

diff --git a/dali-toolkit/internal/controls/renderers/image/image-renderer.h b/dali-toolkit/internal/controls/renderers/image/image-renderer.h
index c63a073..26f1d31 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image/image-renderer.h
+++ b/dali-toolkit/internal/controls/renderers/image/image-renderer.h
@@ -253,7 +253,7 @@ private:
 private:
   Image mImage;
   ImageAtlasManager& mAtlasManager;
-  PixelDataPtr mPixels;
+  PixelData mPixels;
 
   std::string mImageUrl;
   Dali::ImageDimensions mDesiredSize;

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
index 5202d42..a2c1ad7 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
@@ -62,7 +62,7 @@ SvgRenderer* RasterizingTask::GetSvgRenderer() const
   return mSvgRenderer.Get();
 }
 
-PixelDataPtr RasterizingTask::GetPixelData() const
+PixelData RasterizingTask::GetPixelData() const
 {
   return mPixelData;
 }

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
index e3b1ce2..556a7e6 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
@@ -85,7 +85,7 @@ public:
    * Get the rasterization result.
    * @return The pixel data with the rasterized pixels.
    */
-  PixelDataPtr GetPixelData() const;
+  PixelData GetPixelData() const;
 
 private:
 
@@ -97,7 +97,7 @@ private:
 
 private:
   SvgRendererPtr  mSvgRenderer;
-  PixelDataPtr    mPixelData;
+  PixelData       mPixelData;
   NSVGimage*      mParsedSvg;
   unsigned int    mWidth;
   unsigned int    mHeight;

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
index f48a5ad..ce3dbc0 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
@@ -189,7 +189,7 @@ void SvgRenderer::AddRasterizationTask( const Vector2& size )
   }
 }
 
-void SvgRenderer::ApplyRasterizedImage( PixelDataPtr rasterizedPixelData )
+void SvgRenderer::ApplyRasterizedImage( PixelData rasterizedPixelData )
 {
   if( GetIsOnStage()  )
   {
@@ -212,7 +212,7 @@ void SvgRenderer::ApplyRasterizedImage( PixelDataPtr rasterizedPixelData )
     }
     else // no atlasing
     {
-      Atlas texture = Atlas::New( rasterizedPixelData->GetWidth(), rasterizedPixelData->GetHeight() );
+      Atlas texture = Atlas::New( rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight() );
       texture.Upload( rasterizedPixelData, 0, 0 );
 
       if( mAtlasRect == FULL_TEXTURE_RECT )

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.h b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.h
index d1437ff..ceb554c 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.h
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.h
@@ -117,7 +117,7 @@ public:
    *
    * @param[in] rasterizedPixelData The pixel buffer with the rasterized pixels
    */
-  void ApplyRasterizedImage( PixelDataPtr rasterizedPixelData );
+  void ApplyRasterizedImage( PixelData rasterizedPixelData );
 
 private:
   /**

diff --git a/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp b/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp
index ab70af4..33475c1 100644 (file)
--- a/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp
+++ b/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp
@@ -138,19 +138,19 @@ bool ImageAtlas::Upload( Vector4& textureRect,
   return false;
 }
 
-bool ImageAtlas::Upload( Vector4& textureRect, PixelDataPtr pixelData )
+bool ImageAtlas::Upload( Vector4& textureRect, PixelData pixelData )
 {
   unsigned int packPositionX = 0;
   unsigned int packPositionY = 0;
-  if( mPacker.Pack( pixelData->GetWidth(), pixelData->GetHeight(), packPositionX, packPositionY ) )
+  if( mPacker.Pack( pixelData.GetWidth(), pixelData.GetHeight(), packPositionX, packPositionY ) )
   {
     mAtlas.Upload( pixelData, packPositionX, packPositionY );
 
     // apply the half pixel correction
     textureRect.x = ( static_cast<float>( packPositionX ) +0.5f ) / mWidth; // left
     textureRect.y = ( static_cast<float>( packPositionY ) +0.5f ) / mHeight; // right
-    textureRect.z = ( static_cast<float>( packPositionX + pixelData->GetWidth() )-0.5f ) / mWidth; // right
-    textureRect.w = ( static_cast<float>( packPositionY + pixelData->GetHeight() )-0.5f ) / mHeight;// bottom
+    textureRect.z = ( static_cast<float>( packPositionX + pixelData.GetWidth() )-0.5f ) / mWidth; // right
+    textureRect.w = ( static_cast<float>( packPositionY + pixelData.GetHeight() )-0.5f ) / mHeight;// bottom
 
     return true;
   }
@@ -181,11 +181,11 @@ void ImageAtlas::UploadToAtlas()
     }
     else
     {
-      if( next->loader.GetPixelData()->GetWidth() < next->packRect.width || next->loader.GetPixelData()->GetHeight() < next->packRect.height  )
+      if( next->loader.GetPixelData().GetWidth() < next->packRect.width || next->loader.GetPixelData().GetHeight() < next->packRect.height  )
       {
         DALI_LOG_ERROR( "Can not upscale the image from actual loaded size [ %d, %d ] to specified size [ %d, %d ]\n",
-                        next->loader.GetPixelData()->GetWidth(),
-                        next->loader.GetPixelData()->GetHeight(),
+                        next->loader.GetPixelData().GetWidth(),
+                        next->loader.GetPixelData().GetHeight(),
                         next->packRect.width,
                         next->packRect.height );
       }
@@ -201,8 +201,8 @@ void ImageAtlas::UploadBrokenImage( const Rect<SizeType>& area )
 {
   BitmapLoader loader = BitmapLoader::New(mBrokenImageUrl, ImageDimensions( area.width, area.height ) );
   loader.Load();
-  SizeType loadedWidth = loader.GetPixelData()->GetWidth();
-  SizeType loadedHeight = loader.GetPixelData()->GetHeight();
+  SizeType loadedWidth = loader.GetPixelData().GetWidth();
+  SizeType loadedHeight = loader.GetPixelData().GetHeight();
 
   bool needBackgroundClear = false;
   SizeType packX = area.x;
@@ -223,7 +223,7 @@ void ImageAtlas::UploadBrokenImage( const Rect<SizeType>& area )
   {
     SizeType size = area.width * area.height * Pixel::GetBytesPerPixel( mPixelFormat );
     PixelBuffer* buffer = new PixelBuffer [size];
-    PixelDataPtr background = PixelData::New( buffer, area.width, area.height, mPixelFormat, PixelData::DELETE_ARRAY );
+    PixelData background = PixelData::New( buffer, area.width, area.height, mPixelFormat, PixelData::DELETE_ARRAY );
     for( SizeType idx = 0; idx < size; idx++ )
     {
       buffer[idx] = 0x00;

diff --git a/dali-toolkit/internal/image-atlas/image-atlas-impl.h b/dali-toolkit/internal/image-atlas/image-atlas-impl.h
index 4e3bb0b..524b257 100644 (file)
--- a/dali-toolkit/internal/image-atlas/image-atlas-impl.h
+++ b/dali-toolkit/internal/image-atlas/image-atlas-impl.h
@@ -76,9 +76,9 @@ public:
                bool orientationCorrection);
 
   /**
-   * @copydoc Toolkit::ImageAtlas::Upload( Vector4&, PixelDataPtr )
+   * @copydoc Toolkit::ImageAtlas::Upload( Vector4&, PixelData )
    */
-  bool Upload( Vector4& textureRect, PixelDataPtr pixelData );
+  bool Upload( Vector4& textureRect, PixelData pixelData );
 
   /**
    * @copydoc Toolkit::ImageAtlas::Remove