(Image) Remove API that allows various load/release policies with a NativeImage

[Problem]  We have an API that makes the user think that we can alter the loading and releasing of
           native images. This is not the case (and no implementation is provided either).
[Solution] Remove the API.

Change-Id: I3219652937b70465429080a629f9ee77a501882a

diff --git a/dali/internal/event/images/image-impl.cpp b/dali/internal/event/images/image-impl.cpp
index 2db8661..af4b9d5 100644 (file)
--- a/dali/internal/event/images/image-impl.cpp
+++ b/dali/internal/event/images/image-impl.cpp
@@ -120,7 +120,7 @@ ImagePtr Image::New( const std::string& filename, const Dali::ImageAttributes& a
   return image;
 }
 
-ImagePtr Image::New( NativeImage& nativeImg, LoadPolicy loadPol, ReleasePolicy releasePol )
+ImagePtr Image::New( NativeImage& nativeImg )
 {
   ImagePtr image = new Image;
   image->Initialize();

diff --git a/dali/internal/event/images/image-impl.h b/dali/internal/event/images/image-impl.h
index 45e72ea..0d926f5 100644 (file)
--- a/dali/internal/event/images/image-impl.h
+++ b/dali/internal/event/images/image-impl.h
@@ -95,13 +95,9 @@ public:
    * the maximum size of the image is limited by GL_MAX_TEXTURE_SIZE
    * @pre nativeImg should be initialised
    * @param [in] nativeImg already initialised NativeImage
-   * @param [in] loadPol controls time of loading a resource from the filesystem (default: load when Image is created).
-   * @param [in] releasePol optionally relase memory when image is not visible on screen (default: keep image data until Image object is alive).
    * @return a pointer to a newly created object.
    */
-  static ImagePtr New( NativeImage& nativeImg,
-                       LoadPolicy loadPol=ImageLoadPolicyDefault,
-                       ReleasePolicy releasePol=ImageReleasePolicyDefault );
+  static ImagePtr New( NativeImage& nativeImg );
 
   /**
    * @copydoc Dali::Image::GetLoadingState()

diff --git a/dali/public-api/images/image.cpp b/dali/public-api/images/image.cpp
index 41079ca..6d9fe6b 100644 (file)
--- a/dali/public-api/images/image.cpp
+++ b/dali/public-api/images/image.cpp
@@ -131,12 +131,6 @@ Image Image::New(NativeImage& nativeImg)
   return Image(internal.Get());
 }
 
-Image Image::New(NativeImage& nativeImg, LoadPolicy loadPol, ReleasePolicy releasePol)
-{
-  Internal::ImagePtr internal = Internal::Image::New(nativeImg, loadPol, releasePol);
-  return Image(internal.Get());
-}
-
 Image Image::DownCast( BaseHandle handle )
 {
   return Image( dynamic_cast<Dali::Internal::Image*>(handle.GetObjectPtr()) );

diff --git a/dali/public-api/images/image.h b/dali/public-api/images/image.h
index fb4f68b..4aa03e0 100644 (file)
--- a/dali/public-api/images/image.h
+++ b/dali/public-api/images/image.h
@@ -269,18 +269,6 @@ public:
   static Image New(NativeImage& nativeImg);
 
   /**
-   * @brief Creates object with already loaded NativeImage.
-   *
-   * The maximum size of the image is limited by GL_MAX_TEXTURE_SIZE
-   * @pre nativeImg should be initialised
-   * @param [in] nativeImg already initialised NativeImage
-   * @param [in] loadPol    The LoadPolicy to apply when allocating the GL resource.
-   * @param [in] releasePol The ReleasePolicy to apply to Image.
-   * @return A handle to a newly allocated object
-   */
-  static Image New(NativeImage& nativeImg, LoadPolicy loadPol, ReleasePolicy releasePol);
-
-  /**
    * @brief Downcast an Object handle to Image handle.
    *
    * If handle points to a Image object the