X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fimages%2Fresource-image.h;h=e74e30acd940e4d269a3007ba083c1fcb2dbfbbb;hb=ff364987bf3c2ef5bb2b57348747eeb784d8ba90;hp=9c44af140c3f1c594576eb44df3b99b3b47ab362;hpb=1beff77c120a602b29591915df7803dca03a286a;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 9c44af1..e74e30a 100644
--- a/dali/public-api/images/resource-image.h
+++ b/dali/public-api/images/resource-image.h
@@ -42,28 +42,15 @@ class ResourceImage;
 /**
  * @brief ResourceImage is an image loaded using a URL
  *
- * <h3>ResourceImage Loading</h3>
+ * <i>Customizing load requests</i>
  *
- * When the ResourceImage is created, resource loading will be attempted unless a compatible resource is found in cache.
- * Scaling of images to a desired smaller size can be requested by providing desired dimensions,
- * scaling mode and filter mode to to ResourceImage::New().
- *
- * <i>Custom load requests</i>
  * Size, scaling mode, filter mode, and orientation compensation can be set when requesting an image.
  *
- * <i>Compatible resources</i>
- *
- * Before loading a new ResourceImage the internal image resource cache is checked by DALi.
- * If there is an image already loaded in memory and is deemed "compatible" with the requested image,
- * that resource is reused.
- * This happens for example if a loaded image exists with the same URL, scaling and filtering modes,
- * and the difference between both of the dimensions is less than a few pixels.
- *
  * <i>Reloading images</i>
  *
  * The same request used on creating the ResourceImage is re-issued when reloading images.
  * If the file changed since the last load operation, this might result in a different resource.
- * Reload only takes effect if the ResourceImage has already finished loading
+ * Reload only takes effect if the ResourceImage has already finished loading.
  *
  * Signals
  * | %Signal Name         | Method                       |
@@ -76,18 +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
-   */
-  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
    */
@@ -154,6 +129,7 @@ public:
    *
    * @sa Dali::FittingMode::Type Dali::SamplingMode::Type
    * @SINCE_1_0.0
+   * @REMARK_INTERNET
    * @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
@@ -161,45 +137,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
-   * @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
-   * @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.
-   * @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,
-                            ImageDimensions size,
-                            FittingMode::Type fittingMode = FittingMode::DEFAULT,
-                            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.
@@ -207,8 +149,6 @@ public:
    * @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,
@@ -217,27 +157,17 @@ public:
   ///@}
 
   /**
-   * @brief Downcast an Object handle to ResourceImage handle.
+   * @brief Downcast a handle to ResourceImage handle.
    *
    * If handle points to a ResourceImage object the
    * downcast produces valid handle. If not the returned handle is left uninitialized.
    * @SINCE_1_0.0
-   * @param[in] handle to An object
-   * @return handle to a Image object or an uninitialized handle
+   * @param[in] handle Handle to an object
+   * @return Handle to a Image object or an uninitialized handle
    */
   static ResourceImage DownCast( BaseHandle handle );
 
   /**
-   * @DEPRECATED_1_1.3
-   *
-   * @brief Return load policy.
-   *
-   * @SINCE_1_0.0
-   * @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.