[dali_1.0.3] Merge branch 'tizen'

Change-Id: Iaf545a4dd5e0add70040c7249b4e7f4c32d3ab4c
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>

diff --git a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index b6ff462..7a60aa6 100644 (file)
--- a/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/base/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@ -17,12 +17,14 @@
 
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/table-view/table-view-impl.h>
-#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/object/ref-object.h>
-#include <dlog.h>
 #include <sstream>
+#include <dali/public-api/object/ref-object.h>
+#include <dali/integration-api/debug.h>
+
+// INTERNAL INCLUDES
+#include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 
 using namespace Dali;
 using namespace std;
@@ -70,8 +72,8 @@ struct RelativeToWidthOrHeight
 // debugging support, very useful when new features are added or bugs are hunted down
 // currently not called from code so compiler will optimize these away, kept here for future debugging
 
-#define TABLEVIEW_TAG "DALI Toolkit::TableView"
-#define TV_LOG(fmt, args...) LOG(LOG_INFO, TABLEVIEW_TAG, fmt, ## args)
+#define TABLEVIEW_TAG "DALI Toolkit::TableView "
+#define TV_LOG(fmt, args...) Debug::LogMessage(Debug::DebugInfo, TABLEVIEW_TAG fmt, ## args)
 
 void PrintArray( Array2d<Dali::Toolkit::Internal::TableView::CellData>& array )
 {

diff --git a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index 7e2a1af..da3443f 100644 (file)
--- a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@ -2267,7 +2267,7 @@ ImfManager::ImfCallbackData TextInput::ImfEventReceived( Dali::ImfManager& imfMa
       }
       else
       {
-        if( std::abs( imfEvent.cursorOffset ) < mCursorPosition )
+        if( static_cast<std::size_t>(std::abs( imfEvent.cursorOffset )) < mCursorPosition )
         {
           toDelete = mCursorPosition + imfEvent.cursorOffset;
         }

diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index ea033f1..7c9029f 100644 (file)
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -1,6 +1,7 @@
 /gmon.out
 /aclocal.m4
 /autom4te.cache
+/compile
 /config.guess
 /config.log
 /config.status

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 20810b3..454053f 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -30,7 +30,6 @@ AC_SUBST(DALI_TOOLKIT_VERSION)
 
 PKG_CHECK_MODULES(DALICORE, dali-core)
 PKG_CHECK_MODULES(DALI, dali)
-PKG_CHECK_MODULES(DLOG, dlog)
 PKG_CHECK_MODULES(FRIBIDI, fribidi)
 
 DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN

diff --git a/docs/content/programming-guide/image-text-mesh-actor.h b/docs/content/programming-guide/image-text-mesh-actor.h
index 9b560b7..014c95e 100644 (file)
--- a/docs/content/programming-guide/image-text-mesh-actor.h
+++ b/docs/content/programming-guide/image-text-mesh-actor.h
@@ -19,12 +19,45 @@
  * Dali::ImageActor myImageActor = ImageActor::New(image);
  * @endcode
  *
+ * <h3 class="pg">Resizing at Load Time</h3>
+ * An application loading images from an external source will often want to
+ * display those images at a lower resolution than their native ones.
+ * To support this, %Dali can resize an image at load time so that its in-memory
+ * copy uses less space and its visual quality benefits from being prefiltered.
+ * There are four algorithms which can be used to fit an image to a desired
+ * rectangle, a desired width or a desired height
+ * (see Dali::ImageAttributes::ScalingMode).
+ *
+ * Here is an example doing rescaling:
+ *
+ * @code
+ * Dali::ImageAttributes attributes;
+ * attributes.SetSize( 256, 192 );
+ * attributes.SetScalingMode( Dali::ImageAttributes::ScaleToFill );
+ * Dali::Image image = Dali::Image::New( filename, attributes );
+ * @endcode
+ *
+ * This example sets the size and scaling mode appropriately for a large thumbnail
+ * on an Dali::ImageAttributes instance and passes that to Dali::Image construction.
+ * In general, to enable scaling on load, set-up a Dali::ImageAttributes object with
+ * a non-zero width or height and one of the four scaling modes, and pass it into a
+ * Dali::Image creator function as shown above.
+ *
+ * The scaling modes and a suggested use-case for each are as follows:
+ * <ol>
+ *   <li> Dali::ImageAttributes::ShrinkToFit Full-screen image display: Limit loaded image resolution to device resolution.
+ *   <li> Dali::ImageAttributes::ScaleToFill Thumbnail gallery grid: Limit loaded image resolution to screen tile.
+ *   <li> Dali::ImageAttributes::FitWidth Image columns: Limit loaded image resolution to column.
+ *   <li> Dali::ImageAttributes::FitHeight Image rows: Limit loaded image resolution to row height.
+ * </ol>
+ *
+ * The dali-demo project contains a full example under <code>examples/image</code>.
  *
  * <h2 class="pg">Style</h2>
  * The Actor can render an image in two different ways.<br>
- * -# STYLE_QUAD: A simple flat quad style for redering image.<br>
+ * -# STYLE_QUAD: A simple flat quad style for rendering images.<br>
  * -# STYLE_NINE_PATCH: This style gives the flexibility to stretch images by dividing it into 9 sections.
- * The four corners are unscaled; the four edges are scaled in one axis, and the middle is scaled in both axes.<br>
+ * The four corners are not scaled; the four edges are scaled in one axis, and the middle is scaled in both axes.<br>
  *
  * @code
  * // default : ImageActor::STYLE_QUAD

diff --git a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp b/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
index 83d728e..9e5ac4c 100644 (file)
--- a/optional/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/optional/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 = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 2;
+const unsigned int TOOLKIT_MICRO_VERSION = 3;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 12d71b5..e2b9f75 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.0.2
+Version:    1.0.3
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0