Revert "[3.0] Remove experimental features"

This reverts commit b46cd79dd6c74a453f5bcb852d51fbdc626eba85.

Change-Id: I12c6d6d242f759cd9271a5ca7b462188ae4a71aa

diff --git a/adaptors/common/object-profiler.cpp b/adaptors/common/object-profiler.cpp
index 7d86bf0..2a1e71a 100644 (file)
--- a/adaptors/common/object-profiler.cpp
+++ b/adaptors/common/object-profiler.cpp
@@ -22,6 +22,7 @@
 #include <stdlib.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/profiling.h>
 #include <stdlib.h>
 #include <dali/integration-api/debug.h>
 #include <dali/integration-api/profiling.h>

+#include <dali/public-api/actors/image-actor.h>

 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/object/ref-object.h>
 #include <dali/public-api/object/base-object.h>

diff --git a/adaptors/ecore/common/ecore-indicator-impl.cpp b/adaptors/ecore/common/ecore-indicator-impl.cpp
index 7d4bb4b..b954b69 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.cpp
+++ b/adaptors/ecore/common/ecore-indicator-impl.cpp
@@ -37,6 +37,8 @@
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
 #include <dali/public-api/common/stage.h>
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
 #include <dali/public-api/common/stage.h>

+#include <dali/public-api/actors/blending.h>
+#include <dali/public-api/shader-effects/shader-effect.h>

 #include <dali/public-api/images/buffer-image.h>
 
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/images/buffer-image.h>
 
 #include <dali/integration-api/debug.h>

diff --git a/adaptors/ecore/common/ecore-indicator-impl.h b/adaptors/ecore/common/ecore-indicator-impl.h
index 47a2ac5..53e93d1 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.h
+++ b/adaptors/ecore/common/ecore-indicator-impl.h
@@ -19,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
  */
 
 // EXTERNAL INCLUDES

+#include <dali/public-api/actors/image-actor.h>

 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/events/pan-gesture-detector.h>
 #include <dali/public-api/animation/animation.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/events/pan-gesture-detector.h>

diff --git a/adaptors/emscripten/wrappers/dali-wrapper.cpp b/adaptors/emscripten/wrappers/dali-wrapper.cpp
index 9df479b..e7bc777 100644 (file)
--- a/adaptors/emscripten/wrappers/dali-wrapper.cpp
+++ b/adaptors/emscripten/wrappers/dali-wrapper.cpp
@@ -882,6 +882,11 @@ EMSCRIPTEN_BINDINGS(dali_wrapper)
     .value("TRIANGLE_STRIP",  Dali::Geometry::TRIANGLE_STRIP)
 ;
 
     .value("TRIANGLE_STRIP",  Dali::Geometry::TRIANGLE_STRIP)
 ;
 

+  enum_<Dali::Image::ReleasePolicy>("ReleasePolicy")
+    .value("UNUSED",          Dali::Image::UNUSED)
+    .value("NEVER",           Dali::Image::NEVER)
+;
+

   enum_<Dali::Pixel::Format>("PixelFormat")
     .value("A8", Dali::Pixel::Format::A8)
     .value("L8", Dali::Pixel::Format::L8)
   enum_<Dali::Pixel::Format>("PixelFormat")
     .value("A8", Dali::Pixel::Format::A8)
     .value("L8", Dali::Pixel::Format::L8)

diff --git a/adaptors/emscripten/wrappers/shader-effect-wrapper.h b/adaptors/emscripten/wrappers/shader-effect-wrapper.h
index 51f7cf8..b2b3d0d 100644 (file)
--- a/adaptors/emscripten/wrappers/shader-effect-wrapper.h
+++ b/adaptors/emscripten/wrappers/shader-effect-wrapper.h
@@ -2,7 +2,7 @@
 #define __DALI_SHADER_EFFECT_WRAPPER_H__
 
 /*
 #define __DALI_SHADER_EFFECT_WRAPPER_H__
 
 /*

- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -20,7 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>

-#include <dali/devel-api/shader-effects/shader-effect.h>

 #include "emscripten/emscripten.h"
 #include "emscripten/bind.h"
 
 #include "emscripten/emscripten.h"
 #include "emscripten/bind.h"