Merge "Add features to download images over http protocol." into tizen

diff --git a/README b/README
index ceb23a6..2fe85e5 100644 (file)
--- a/README
+++ b/README
@@ -24,6 +24,10 @@ T.O.C.
 
  gbs build -A [TARGET_ARCH] --spec dali-adaptor-mobile.spec
 
+ Alternatively for latest devices:
+
+ gbs build -A [TARGET_ARCH] --spec dali-adaptor-mobile.spec --define "TIZEN_SDK_2_3 1"
+
 1.3. WEARABLE Profile
 ---------------------
 

diff --git a/adaptors/base/performance-logging/statistics/stat-context.cpp b/adaptors/base/performance-logging/statistics/stat-context.cpp
index 468cb28..7197322 100644 (file)
--- a/adaptors/base/performance-logging/statistics/stat-context.cpp
+++ b/adaptors/base/performance-logging/statistics/stat-context.cpp
@@ -22,6 +22,9 @@
 // INTERNAL INCLUDES
 #include <dali/integration-api/platform-abstraction.h>
 
+// EXTERNAL INCLUDES
+#include <cstdio>
+
 namespace Dali
 {
 

diff --git a/adaptors/base/performance-logging/statistics/stat-context.h b/adaptors/base/performance-logging/statistics/stat-context.h
index 2e96b9f..2f241d9 100644 (file)
--- a/adaptors/base/performance-logging/statistics/stat-context.h
+++ b/adaptors/base/performance-logging/statistics/stat-context.h
@@ -24,6 +24,8 @@
 #include <base/interfaces/performance-interface.h>
 #include <base/performance-logging/statistics/stat-context-log-interface.h>
 
+// EXTERNAL INCLUDES
+#include <string>
 
 namespace Dali
 {

diff --git a/adaptors/base/update-thread.cpp b/adaptors/base/update-thread.cpp
index b1b1112..8247a69 100644 (file)
--- a/adaptors/base/update-thread.cpp
+++ b/adaptors/base/update-thread.cpp
@@ -18,15 +18,16 @@
 // CLASS HEADER
 #include "update-thread.h"
 
-// EXTERNAL INCLUDES
-#include <boost/thread.hpp>
-
 // INTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
 #include <base/interfaces/adaptor-internal-services.h>
 #include <base/update-render-synchronization.h>
 #include <base/environment-options.h>
 
+// EXTERNAL INCLUDES
+#include <boost/thread.hpp>
+#include <cstdio>
+
 namespace Dali
 {
 

diff --git a/adaptors/public-api/dali-adaptor-version.cpp b/adaptors/public-api/dali-adaptor-version.cpp
index 3173f00..049a751 100644 (file)
--- a/adaptors/public-api/dali-adaptor-version.cpp
+++ b/adaptors/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 0;
-const unsigned int ADAPTOR_MICRO_VERSION = 29;
+const unsigned int ADAPTOR_MICRO_VERSION = 30;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/adaptors/tizen/framework-tizen.cpp b/adaptors/tizen/framework-tizen.cpp
index c3687b0..8986853 100644 (file)
--- a/adaptors/tizen/framework-tizen.cpp
+++ b/adaptors/tizen/framework-tizen.cpp
@@ -67,7 +67,11 @@ struct Framework::Impl
     mEventCallback.terminate = AppTerminate;
     mEventCallback.pause = AppPause;
     mEventCallback.resume = AppResume;
+#if defined(TIZEN_SDK_2_3)
+    mEventCallback.app_control = AppControl;
+#else
     mEventCallback.service = AppService;
+#endif
     mEventCallback.low_memory = NULL;
     mEventCallback.low_battery = NULL;
     mEventCallback.device_orientation = DeviceRotated;
@@ -128,14 +132,23 @@ struct Framework::Impl
    * Called by AppCore when the application is launched from another module (e.g. homescreen).
    * @param[in] b the bundle data which the launcher module sent
    */
+
+#if defined(TIZEN_SDK_2_3)
+  static void AppControl(app_control_h app_control, void *data)
+#else
   static void AppService(service_h service, void *data)
+#endif
   {
     Framework* framework = static_cast<Framework*>(data);
 
     if(framework)
     {
       bundle *bundleData = NULL;
+#if defined(TIZEN_SDK_2_3)
+      app_control_to_bundle(app_control, &bundleData);
+#else
       service_to_bundle(service, &bundleData);
+#endif
 
       if(bundleData)
       {

diff --git a/adaptors/tizen/tilt-sensor-impl-tizen.cpp b/adaptors/tizen/tilt-sensor-impl-tizen.cpp
index a9be264..337d5dc 100644 (file)
--- a/adaptors/tizen/tilt-sensor-impl-tizen.cpp
+++ b/adaptors/tizen/tilt-sensor-impl-tizen.cpp
@@ -20,10 +20,8 @@
 
 // EXTERNAL INCLUDES
 #include <cmath>
-#ifdef DALI_PROFILE_LITE
+#ifdef SENSOR_ENABLED
 #include <sensor_internal.h>
-#else
-#include <sensor.h>
 #endif
 
 #include <dali/public-api/object/type-registry.h>
@@ -32,10 +30,6 @@
 // INTERNAL INCLUDES
 #include <singleton-service-impl.h>
 
-#ifdef __arm__
-#define SENSOR_ENABLED
-#endif
-
 namespace // unnamed namespace
 {
 

diff --git a/packaging/dali-adaptor-common.spec b/packaging/dali-adaptor-common.spec
index dbea51e..f2bd4f3 100644 (file)
--- a/packaging/dali-adaptor-common.spec
+++ b/packaging/dali-adaptor-common.spec
@@ -2,7 +2,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.0.29
+Version:    1.0.30
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/packaging/dali-adaptor-mobile.spec b/packaging/dali-adaptor-mobile.spec
index 59b533d..e6fea63 100644 (file)
--- a/packaging/dali-adaptor-mobile.spec
+++ b/packaging/dali-adaptor-mobile.spec
@@ -1,6 +1,6 @@
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.0.29
+Version:    1.0.30
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0
@@ -124,6 +124,10 @@ LDFLAGS+=" -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--gc-sections "
 CXXFLAGS+=" -D_ARCH_ARM_ -lgcc"
 %endif
 
+%if 0%{?TIZEN_SDK_2_3}
+CXXFLAGS+=" -DTIZEN_SDK_2_3"
+%endif
+
 libtoolize --force
 cd %{_builddir}/%{name}-%{version}/build/tizen
 autoreconf --install

diff --git a/packaging/dali-adaptor-tv.spec b/packaging/dali-adaptor-tv.spec
index 5138b01..f7a1f87 100644 (file)
--- a/packaging/dali-adaptor-tv.spec
+++ b/packaging/dali-adaptor-tv.spec
@@ -1,6 +1,6 @@
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.0.29
+Version:    1.0.30
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/packaging/dali-adaptor-wearable.spec b/packaging/dali-adaptor-wearable.spec
index 8ed97ec..43e6828 100644 (file)
--- a/packaging/dali-adaptor-wearable.spec
+++ b/packaging/dali-adaptor-wearable.spec
@@ -1,6 +1,6 @@
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.0.29
+Version:    1.0.30
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 05d1773..407e9ef 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -2,7 +2,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.0.29
+Version:    1.0.30
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0

diff --git a/platform-abstractions/slp/data-cache/data-cache-impl.cpp b/platform-abstractions/slp/data-cache/data-cache-impl.cpp
index bee00b3..b3d22ac 100644 (file)
--- a/platform-abstractions/slp/data-cache/data-cache-impl.cpp
+++ b/platform-abstractions/slp/data-cache/data-cache-impl.cpp
@@ -27,6 +27,7 @@
 // EXTERNAL INCLUDES
 #include <boost/functional/hash.hpp>
 #include <boost/thread.hpp>
+#include <cstdio>
 
 namespace Dali
 {

diff --git a/platform-abstractions/slp/image-loaders/loader-bmp.cpp b/platform-abstractions/slp/image-loaders/loader-bmp.cpp
index caa8a19..66df868 100644 (file)
--- a/platform-abstractions/slp/image-loaders/loader-bmp.cpp
+++ b/platform-abstractions/slp/image-loaders/loader-bmp.cpp
@@ -22,6 +22,8 @@
 #include <dali/integration-api/bitmap.h>
 #include <dali/public-api/images/image-attributes.h>
 
+#include <cstdlib>
+
 namespace Dali
 {
 using Integration::Bitmap;

diff --git a/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp b/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp
index 942e054..22cfec1 100644 (file)
--- a/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp
+++ b/platform-abstractions/slp/resource-loader/assimp-model-builder.cpp
@@ -18,12 +18,6 @@
 // Class header
 #include "assimp-model-builder.h"
 
-// External headers
-#include <libgen.h>
-#include <assimp/assimp.hpp>
-#include <assimp/aiScene.h>
-#include <assimp/aiPostProcess.h> // Post processing flags
-
 // Core headers
 #include <dali/public-api/common/light.h>
 #include <dali/public-api/math/matrix.h>
@@ -34,15 +28,20 @@
 #include <dali/public-api/modeling/entity-animator-map.h>
 #include <dali/public-api/modeling/model-data.h>
 #include <dali/public-api/modeling/model-animation-map.h>
-
 #include <dali/public-api/animation/key-frames.h>
-
 #include <dali/integration-api/debug.h>
 
 // Local headers
 #include "assimp-proxy.h"
 #include "left-hand-convertor.h"
 
+// External headers
+#include <libgen.h>
+#include <assimp/assimp.hpp>
+#include <assimp/aiScene.h>
+#include <assimp/aiPostProcess.h> // Post processing flags
+#include <cstdio>
+
 namespace Dali
 {
 namespace SlpPlatform

diff --git a/platform-abstractions/slp/slp-logging.cpp b/platform-abstractions/slp/slp-logging.cpp
index d47919f..dc54e0d 100644 (file)
--- a/platform-abstractions/slp/slp-logging.cpp
+++ b/platform-abstractions/slp/slp-logging.cpp
@@ -21,7 +21,9 @@
 // EXTERNAL INCLUDES
 #ifndef DALI_PROFILE_UBUNTU
 #include <dlog.h>
-#endif // DALI_PROFILE_UBUNTU
+#else // DALI_PROFILE_UBUNTU
+#include <cstdio>
+#endif
 
 namespace Dali
 {