X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fimages%2Fresource-image.h;h=4e388727bf97c4e14d82a16094e4f95d2b1949b3;hb=d80a089b3d60699c0c263f127b343d6d90370576;hp=d354a26b6c6ec735571f0d620996f15c52af2670;hpb=2f3593b5d0b7e7fad646b160d8ef4e926f47865b;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/images/resource-image.h b/dali/public-api/images/resource-image.h
index d354a26..4e38872 100644
--- a/dali/public-api/images/resource-image.h
+++ b/dali/public-api/images/resource-image.h
@@ -63,20 +63,6 @@ class DALI_IMPORT_API ResourceImage : public Image
 public:
 
   /**
-   * @DEPRECATED_1_1.3. Image loading starts immediately in the frame when then ResourceImage object is created.
-   *
-   * @brief LoadPolicy controls the way images are loaded into memory.
-   * @SINCE_1_0.0
-   * @remarks This is an experimental feature and might not be supported in the next release.
-   * We do recommend not to use it.
-   */
-  enum LoadPolicy
-  {
-    IMMEDIATE, ///< Load image once it is created (default) @SINCE_1_0.0
-    ON_DEMAND  ///< Delay loading until the image is being used (a related actor is added to Stage) @SINCE_1_0.0
-  };
-
-  /**
    * @brief Type of signal for LoadingFinished and Uploaded.
    * @SINCE_1_0.0
    */
@@ -92,6 +78,7 @@ public:
    * loops.
    *
    * @SINCE_1_0.0
+   * @REMARK_STORAGE
    * @param [in] url The URL of the image file.
    * @return The width and height in pixels of the image.
    */
@@ -144,6 +131,7 @@ public:
    * @sa Dali::FittingMode::Type Dali::SamplingMode::Type
    * @SINCE_1_0.0
    * @REMARK_INTERNET
+   * @REMARK_STORAGE
    * @param [in] url The URL of the image file to use.
    * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
    * @return A handle to a newly allocated object
@@ -151,25 +139,11 @@ public:
   static ResourceImage New( const std::string& url, bool orientationCorrection = true );
 
   /**
-   * @DEPRECATED_1_1.3. Use New( const std::string& url ) instead.
-   *
-   * @brief Create an initialised ResourceImage object.
-   *
-   * @SINCE_1_0.0
-   * @REMARK_INTERNET
-   * @param [in] url The URL of the image file to use.
-   * @param [in] loadPol    The LoadPolicy to apply when loading the image resource.
-   * @param [in] releasePol The ReleasePolicy to apply to Image.
-   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
-   * @return A handle to a newly allocated object
-   */
-  static ResourceImage New( const std::string& url, LoadPolicy loadPol, ReleasePolicy releasePol, bool orientationCorrection = true );
-
-  /**
    * @brief Create an initialised ResourceImage object.
    *
    * @SINCE_1_0.0
    * @REMARK_INTERNET
+   * @REMARK_STORAGE
    * @param [in] url The URL of the image file to use.
    * @param [in] size The width and height to fit the loaded image to.
    * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
@@ -183,30 +157,6 @@ public:
                             SamplingMode::Type samplingMode = SamplingMode::DEFAULT,
                             bool orientationCorrection = true );
 
-  /**
-   * @DEPRECATED_1_1.3. Use New( const std::string& url, ImageDimensions size ) instead.
-   *
-   * @brief Create an initialised ResourceImage object.
-   *
-   * @SINCE_1_0.0
-   * @REMARK_INTERNET
-   * @param [in] url The URL of the image file to use.
-   * @param [in] loadPol    The LoadPolicy to apply when loading the image resource.
-   * @param [in] releasePol The ReleasePolicy to apply to Image.
-   * @param [in] size The width and height to fit the loaded image to.
-   * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
-   * @param [in] samplingMode The filtering method used when sampling pixels from the input image while fitting it to desired size.
-   * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
-   * @return A handle to a newly allocated object
-   */
-  static ResourceImage New( const std::string& url,
-                            LoadPolicy loadPol,
-                            ReleasePolicy releasePol,
-                            ImageDimensions size,
-                            FittingMode::Type fittingMode = FittingMode::DEFAULT,
-                            SamplingMode::Type samplingMode = SamplingMode::DEFAULT,
-                            bool orientationCorrection = true );
-
   ///@}
 
   /**
@@ -221,18 +171,6 @@ public:
   static ResourceImage DownCast( BaseHandle handle );
 
   /**
-   * @DEPRECATED_1_1.3
-   *
-   * @brief Return load policy.
-   *
-   * @SINCE_1_0.0
-   * @remarks This is an experimental feature and might not be supported in the next release.
-   * We do recommend not to use it.
-   * @return Resource load policy
-   */
-  LoadPolicy GetLoadPolicy() const;
-
-  /**
    * @brief Query whether the image data has loaded.
    *
    * The asynchronous loading begins when the Image object is created.