Move native-image-interface.h and image-operations.h to public-api

Homescreen app is using native-image.
image-operations should not have been moved to devel-api as it's
included by resource-image.h

Change-Id: Ibf4227bd636c034c039c25c0934821415e657d07

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
index 181769d..4a39cb1 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-native-image.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 
 namespace Dali
 {

diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list
index 372a31c..b5bad8a 100644 (file)
--- a/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@ -66,9 +66,7 @@ devel_api_core_geometry_header_files = \
 
 devel_api_core_images_header_files = \
   $(devel_api_src_dir)/images/atlas.h \
-  $(devel_api_src_dir)/images/distance-field.h \
-  $(devel_api_src_dir)/images/image-operations.h \
-  $(devel_api_src_dir)/images/native-image-interface.h
+  $(devel_api_src_dir)/images/distance-field.h
 
 devel_api_core_modeling_header_files =  \
   $(devel_api_src_dir)/modeling/bone.h \

diff --git a/dali/integration-api/platform-abstraction.h b/dali/integration-api/platform-abstraction.h
index 3165bf7..d39fe6c 100644 (file)
--- a/dali/integration-api/platform-abstraction.h
+++ b/dali/integration-api/platform-abstraction.h
@@ -22,7 +22,7 @@
 
 #include <dali/integration-api/resource-cache.h>
 #include <dali/integration-api/bitmap.h> ///@todo Remove this include (a bunch of stuff needs to include it though)
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 
 namespace Dali
 {

diff --git a/dali/integration-api/resource-types.h b/dali/integration-api/resource-types.h
index 8eb0d19..68df75c 100644 (file)
--- a/dali/integration-api/resource-types.h
+++ b/dali/integration-api/resource-types.h
@@ -25,7 +25,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/dali-common.h>
 #include <dali/public-api/common/vector-wrapper.h>
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/math/uint-16-pair.h>
 #include <dali/public-api/math/vector2.h>
 #include <dali/integration-api/resource-declarations.h>

diff --git a/dali/internal/common/image-attributes.h b/dali/internal/common/image-attributes.h
index 62c9a4c..33aa75b 100644 (file)
--- a/dali/internal/common/image-attributes.h
+++ b/dali/internal/common/image-attributes.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/images/pixel.h>
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/math/rect.h>
 #include <dali/public-api/math/vector2.h>
 

diff --git a/dali/internal/event/resources/resource-client.h b/dali/internal/event/resources/resource-client.h
index be1769d..a5c7a5e 100644 (file)
--- a/dali/internal/event/resources/resource-client.h
+++ b/dali/internal/event/resources/resource-client.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/devel-api/common/ref-counted-dali-vector.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/internal/event/resources/resource-client-declarations.h>
 #include <dali/internal/event/resources/image-ticket.h>
 #include <dali/internal/event/resources/resource-ticket-lifetime-observer.h>

diff --git a/dali/internal/render/common/texture-cache-dispatcher.h b/dali/internal/render/common/texture-cache-dispatcher.h
index e2795db..5e46c11 100644 (file)
--- a/dali/internal/render/common/texture-cache-dispatcher.h
+++ b/dali/internal/render/common/texture-cache-dispatcher.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/images/pixel.h>
 #include <dali/internal/common/message.h>

diff --git a/dali/internal/render/gl-resources/native-texture.h b/dali/internal/render/gl-resources/native-texture.h
index 30e778e..0076934 100644 (file)
--- a/dali/internal/render/gl-resources/native-texture.h
+++ b/dali/internal/render/gl-resources/native-texture.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/integration-api/gl-defines.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/internal/render/gl-resources/texture.h>
 
 namespace Dali

diff --git a/dali/internal/render/gl-resources/texture-factory.h b/dali/internal/render/gl-resources/texture-factory.h
index a4028ca..d04d1ee 100644 (file)
--- a/dali/internal/render/gl-resources/texture-factory.h
+++ b/dali/internal/render/gl-resources/texture-factory.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/internal/render/gl-resources/texture-cache.h>
 
 namespace Dali

diff --git a/dali/internal/update/resources/bitmap-metadata.h b/dali/internal/update/resources/bitmap-metadata.h
index 0783f60..13bd699 100644 (file)
--- a/dali/internal/update/resources/bitmap-metadata.h
+++ b/dali/internal/update/resources/bitmap-metadata.h
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/bitmap.h>
 #include <dali/public-api/images/pixel.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 
 namespace Dali
 {

diff --git a/dali/internal/update/resources/resource-manager.h b/dali/internal/update/resources/resource-manager.h
index 8dd9a83..7ade293 100644 (file)
--- a/dali/internal/update/resources/resource-manager.h
+++ b/dali/internal/update/resources/resource-manager.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/devel-api/common/ref-counted-dali-vector.h>
 

diff --git a/dali/public-api/dali-core.h b/dali/public-api/dali-core.h
index fd4ca80..bfb7484 100644 (file)
--- a/dali/public-api/dali-core.h
+++ b/dali/public-api/dali-core.h
@@ -71,6 +71,7 @@
 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/images/native-image.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/public-api/images/resource-image.h>
 #include <dali/public-api/images/nine-patch-image.h>
 #include <dali/public-api/images/pixel.h>

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index 5363c25..7b99e92 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -149,10 +149,12 @@ public_api_core_images_header_files = \
   $(public_api_src_dir)/images/encoded-buffer-image.h \
   $(public_api_src_dir)/images/frame-buffer-image.h \
   $(public_api_src_dir)/images/image.h \
+  $(public_api_src_dir)/images/image-operations.h \
   $(public_api_src_dir)/images/nine-patch-image.h \
   $(public_api_src_dir)/images/pixel.h \
   $(public_api_src_dir)/images/resource-image.h \
-  $(public_api_src_dir)/images/native-image.h
+  $(public_api_src_dir)/images/native-image.h \
+  $(public_api_src_dir)/images/native-image-interface.h
 
 public_api_core_math_header_files = \
   $(public_api_src_dir)/math/angle-axis.h \

diff --git a/dali/public-api/images/encoded-buffer-image.h b/dali/public-api/images/encoded-buffer-image.h
index 3044870..75d6aec 100644 (file)
--- a/dali/public-api/images/encoded-buffer-image.h
+++ b/dali/public-api/images/encoded-buffer-image.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/math/uint-16-pair.h>
 
 namespace Dali

diff --git a/dali/public-api/images/frame-buffer-image.h b/dali/public-api/images/frame-buffer-image.h
index 5600413..10ee47a 100644 (file)
--- a/dali/public-api/images/frame-buffer-image.h
+++ b/dali/public-api/images/frame-buffer-image.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 #include <dali/public-api/images/pixel.h>
 
 namespace Dali

diff --git a/dali/devel-api/images/image-operations.h b/dali/public-api/images/image-operations.h
similarity index 100%
rename from dali/devel-api/images/image-operations.h
rename to dali/public-api/images/image-operations.h

diff --git a/dali/devel-api/images/native-image-interface.h b/dali/public-api/images/native-image-interface.h
similarity index 90%
rename from dali/devel-api/images/native-image-interface.h
rename to dali/public-api/images/native-image-interface.h
index b347bef..e189a0e 100644 (file)
--- a/dali/devel-api/images/native-image-interface.h
+++ b/dali/public-api/images/native-image-interface.h
@@ -18,6 +18,9 @@
  *
  */
 
+// EXTERNAL INCLUDES
+#include <cstddef>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/object/ref-object.h>
 
@@ -33,6 +36,8 @@ class NativeImageInterface : public Dali::RefObject
 {
 public:
 
+  class Extension; ///< Forward declare future extension interface
+
   /**
    * @brief Create the GL resource for the NativeImage.
    *
@@ -85,6 +90,16 @@ public:
   */
   virtual bool RequiresBlending() const = 0;
 
+  /**
+   * @brief Retrieve the extension for the interface.
+   *
+   * @return The extension if available, NULL otherwise
+   */
+  virtual Extension* GetExtension()
+  {
+    return NULL;
+  }
+
 protected:
 
   /**

diff --git a/dali/public-api/images/native-image.h b/dali/public-api/images/native-image.h
index 49ab3c3..926069e 100644 (file)
--- a/dali/public-api/images/native-image.h
+++ b/dali/public-api/images/native-image.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
-#include <dali/devel-api/images/native-image-interface.h>
+#include <dali/public-api/images/native-image-interface.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/images/resource-image.h b/dali/public-api/images/resource-image.h
index d168b84..cf8d6fa 100644 (file)
--- a/dali/public-api/images/resource-image.h
+++ b/dali/public-api/images/resource-image.h
@@ -25,7 +25,7 @@
 #include <dali/public-api/common/loading-state.h>
 #include <dali/public-api/images/image.h>
 #include <dali/public-api/signals/dali-signal.h>
-#include <dali/devel-api/images/image-operations.h>
+#include <dali/public-api/images/image-operations.h>
 
 namespace Dali
 {