Change RegisterGlCallback function name of GlView

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / image-loader / image.cpp

diff --git a/dali-toolkit/public-api/image-loader/image.cpp b/dali-toolkit/public-api/image-loader/image.cpp
index 2645c07..7b91059 100644 (file)
--- a/dali-toolkit/public-api/image-loader/image.cpp
+++ b/dali-toolkit/public-api/image-loader/image.cpp
@@ -19,47 +19,54 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
+#include <dali-toolkit/public-api/image-loader/image-url.h>
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/rendering/frame-buffer-devel.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Image
 {
+Dali::Toolkit::ImageUrl GenerateUrl(Dali::FrameBuffer frameBuffer, Pixel::Format pixelFormat, uint32_t width, uint32_t height)
+{
+  Texture texture = Texture::New(Dali::TextureType::TEXTURE_2D, pixelFormat, width, height);
+  frameBuffer.AttachColorTexture(texture, 0u, 0u);
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  return imageUrl;
+}
 
-std::string GenerateUrl( Dali::FrameBuffer frameBuffer, Pixel::Format pixelFormat, uint32_t width, uint32_t height )
+Dali::Toolkit::ImageUrl GenerateUrl(const Dali::FrameBuffer frameBuffer, uint8_t index)
 {
-  Texture texture = Texture::New( Dali::TextureType::TEXTURE_2D, pixelFormat, width, height );
-  frameBuffer.AttachColorTexture( texture, 0u, 0u );
-  return Dali::Toolkit::TextureManager::AddTexture( texture );
+  Texture texture = Dali::DevelFrameBuffer::GetColorTexture(frameBuffer, index);
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  return imageUrl;
 }
 
-std::string GenerateUrl( const Dali::FrameBuffer frameBuffer, const uint8_t index )
+Dali::Toolkit::ImageUrl GenerateUrl(const Dali::PixelData pixelData)
 {
-  Texture texture = Dali::DevelFrameBuffer::GetColorTexture( frameBuffer, index );
-  return Dali::Toolkit::TextureManager::AddTexture( texture );
+  Texture texture = Texture::New(TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight());
+  texture.Upload(pixelData);
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  return imageUrl;
 }
 
-std::string GenerateUrl( const Dali::PixelData pixelData )
+Dali::Toolkit::ImageUrl GenerateUrl(const Dali::NativeImageSourcePtr nativeImageSource)
 {
-  Texture texture = Texture::New( TextureType::TEXTURE_2D, pixelData.GetPixelFormat(), pixelData.GetWidth(), pixelData.GetHeight() );
-  texture.Upload( pixelData );
-  return Dali::Toolkit::TextureManager::AddTexture( texture );
+  Texture texture = Dali::Texture::New(*nativeImageSource);
+  Dali::Toolkit::ImageUrl imageUrl = Dali::Toolkit::ImageUrl::New(texture);
+  return imageUrl;
 }
 
-std::string GenerateUrl( const Dali::NativeImageSourcePtr nativeImageSource )
+Dali::Toolkit::ImageUrl GenerateUrl(const Dali::EncodedImageBuffer encodedImageBuffer)
 {
-  Texture texture = Dali::Texture::New( *nativeImageSource );
-  return Dali::Toolkit::TextureManager::AddTexture( texture );
+  return Dali::Toolkit::ImageUrl::New(encodedImageBuffer);
 }
 
-} // TextureManager
+} // namespace Image
 
-} // Toolkit
+} // namespace Toolkit
 
-} // Dali
+} // namespace Dali