Merge "Check NULL return value in builder-impl.cpp" into devel/master

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
index 0e640e7..8bb7176 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.cpp
@@ -79,6 +79,11 @@ void TestApplication::Initialize()
   Dali::Integration::Log::LogFunction logFunction(&TestApplication::LogMessage);
   Dali::Integration::Log::InstallLogFunction(logFunction);
 
+  Dali::Integration::Trace::LogContextFunction logContextFunction(&TestApplication::LogContext);
+  Dali::Integration::Trace::InstallLogContextFunction( logContextFunction );
+
+  Dali::Integration::Trace::LogContext( true, "Test" );
+
   mCore->SceneCreated();
 }
 
@@ -88,6 +93,18 @@ TestApplication::~TestApplication()
   delete mCore;
 }
 
+void TestApplication::LogContext( bool start, const char* tag )
+{
+  if( start )
+  {
+    fprintf(stderr, "INFO: Trace Start: %s", tag);
+  }
+  else
+  {
+    fprintf(stderr, "INFO: Trace End: %s", tag);
+  }
+}
+
 void TestApplication::LogMessage(Dali::Integration::Log::DebugPriority level, std::string& message)
 {
   switch(level)

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
index 5c94252..747b488 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h
@@ -26,6 +26,7 @@
 #include "test-render-controller.h"
 #include <dali/public-api/common/dali-common.h>
 #include <dali/integration-api/resource-policies.h>
+#include <dali/integration-api/trace.h>
 
 namespace Dali
 {
@@ -66,6 +67,7 @@ public:
   void Initialize();
   virtual ~TestApplication();
   static void LogMessage( Dali::Integration::Log::DebugPriority level, std::string& message );
+  static void LogContext( bool start, const char* tag );
   Dali::Integration::Core& GetCore();
   TestPlatformAbstraction& GetPlatform();
   TestRenderController& GetRenderController();

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 26be349..96c78cd 100755 (executable)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -97,6 +97,10 @@ if test "x$enable_debug" = "xyes"; then
   DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDEBUG_ENABLED"
 fi
 
+if test "x$enable_trace" = "xyes"; then
+  DALI_ADAPTOR_CFLAGS="$DALI_ADAPTOR_CFLAGS -DTRACE_ENABLED"
+fi
+
 if test "x$enable_debug" = "xno" -a "x$enable_exportall" = "xno"; then
   DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
 fi
@@ -253,6 +257,7 @@ Configuration
 -------------
   Prefix:                           $prefix
   Debug Build:                      $enable_debug
+  Trace Build:                      $enable_trace
   JavaScript support (V8 required)  $build_javascript_plugin
   CSharp support                    $build_csharp_plugin
   Profile:                          $dali_profile

diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
old mode 100644 (file)
new mode 100755 (executable)
index ac7c1b0..9ef0d46
--- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
+++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h
@@ -31,6 +31,12 @@ namespace Internal DALI_INTERNAL
 {
 class Model3dView;
 }
+
+/**
+ * @addtogroup dali_toolkit_controls_model3d_view
+ * @{
+ */
+
 /**
  * @brief Model3dView is a control for displaying 3d geometry.
  *
@@ -80,11 +86,15 @@ public:
     };
   };
 
+  /**
+   * @brief Enumeration for the type of illumination.
+   * @SINCE_1_1.4
+   */
   enum IlluminationType
   {
-    DIFFUSE,
-    DIFFUSE_WITH_TEXTURE,
-    DIFFUSE_WITH_NORMAL_MAP
+    DIFFUSE,                 ///< diffuse @SINCE_1_1.4
+    DIFFUSE_WITH_TEXTURE,    ///< diffuse with texture @SINCE_1_1.4
+    DIFFUSE_WITH_NORMAL_MAP  ///< diffuse with normal map @SINCE_1_1.4
   };
 
   /**
@@ -173,6 +183,9 @@ public: // Not intended for application developers
 
 };
 
+/**
+ * @}
+ */
 } // namespace Toolkit
 
 } // namespace Dali

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
old mode 100644 (file)
new mode 100755 (executable)
index 646f397..594e6da
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
@@ -157,7 +157,10 @@ class RulerExtension;
 class DALI_IMPORT_API Ruler : public RefObject
 {
 public:
-  /// @brief The type of the ruler
+  /**
+   * @brief Enumeration for the type of the ruler.
+   * @SINCE_1_0.0
+   */
   enum RulerType {
     Fixed,  ///< A fixed ruler @SINCE_1_0.0
     Free    ///< A free ruler @SINCE_1_0.0

diff --git a/dali-toolkit/public-api/controls/video-view/video-view.h b/dali-toolkit/public-api/controls/video-view/video-view.h
index 4f0e12e..85fbd8d 100755 (executable)
--- a/dali-toolkit/public-api/controls/video-view/video-view.h
+++ b/dali-toolkit/public-api/controls/video-view/video-view.h
@@ -77,8 +77,16 @@ public:
     PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,  ///< @SINCE_1_0.0
   };
 
+  /**
+   * @brief Enumeration for the instance of properties belonging to the VideoView class.
+   * @SINCE_1_1.38
+   */
   struct Property
   {
+    /**
+     * @brief Enumeration for the instance of properties belonging to the VideoView class.
+     * @SINCE_1_1.38
+     */
     enum
     {
       /**
@@ -138,6 +146,10 @@ public:
    */
   struct DisplayMode
   {
+    /**
+     * @brief The values of this enum determine how the video should be display mode to the view.
+     * @SINCE_1_3_15
+     */
     enum Type
     {
       /**

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 57d0b34..5b8d07f 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 3;
-const unsigned int TOOLKIT_MICRO_VERSION = 17;
+const unsigned int TOOLKIT_MICRO_VERSION = 19;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/dali-toolkit/public-api/text/rendering-backend.h b/dali-toolkit/public-api/text/rendering-backend.h
old mode 100644 (file)
new mode 100755 (executable)
index 97abfb8..00686ed
--- a/dali-toolkit/public-api/text/rendering-backend.h
+++ b/dali-toolkit/public-api/text/rendering-backend.h
@@ -27,7 +27,10 @@ namespace Toolkit
 namespace Text
 {
 
-// The type of text renderer required
+/**
+ * @brief Enumeration for the type of text renderer required.
+ * @SINCE_1_0.0
+ */
 enum RenderingType
 {
   RENDERING_SHARED_ATLAS, ///< A bitmap-based solution where renderers can share a texture atlas @SINCE_1_0.0

diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h
old mode 100644 (file)
new mode 100755 (executable)
index bc706fb..813d2ac
--- a/doc/dali-toolkit-doc.h
+++ b/doc/dali-toolkit-doc.h
@@ -89,6 +89,10 @@
  *    <td>ImageView is a control displaying an image.</td>
  * </tr>
  * <tr>
+ *    <td style="padding-left:1em">@ref dali_toolkit_controls_model3d_view</td>
+ *    <td>Model3dView is a control for displaying 3d geometry.</td>
+ * </tr>
+ * <tr>
  *    <td style="padding-left:1em">@ref dali_toolkit_controls_scroll_bar</td>
  *    <td>ScrollBar is a component that can be linked to the scrollable objects.</td>
  * </tr>
@@ -172,6 +176,9 @@
  *     @defgroup dali_toolkit_controls_image_view Image View
  *     @brief ImageView is a control displaying an image.
 
+ *     @defgroup dali_toolkit_controls_model3d_view Model3dView
+ *     @brief Model3dView is a control for displaying 3d geometry.
+
  *     @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
  *     @brief ScrollBar is a component that can be linked to the scrollable objects.
 

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 2de69d6..3329812 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    1.3.17
+Version:    1.3.19
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT
@@ -165,6 +165,9 @@ DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?enable_trace}
+      --enable-trace \
+%endif
            --enable-i18n=yes \
            --enable-rename-so=no
 
@@ -194,6 +197,9 @@ DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
 %if 0%{?enable_debug}
            --enable-debug \
 %endif
+%if 0%{?enable_trace}
+      --enable-trace \
+%endif
            --enable-i18n=yes \
            --enable-rename-so=no