Merge "Remove deprecated APIs from GaussianBlurView" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / text / text-utils-devel.cpp

diff --git a/dali-toolkit/devel-api/text/text-utils-devel.cpp b/dali-toolkit/devel-api/text/text-utils-devel.cpp
index 3a286ad..eaab0e5 100755 (executable)
--- a/dali-toolkit/devel-api/text/text-utils-devel.cpp
+++ b/dali-toolkit/devel-api/text/text-utils-devel.cpp
@@ -588,6 +588,7 @@ Devel::PixelBuffer Render( const RendererParameters& textParameters, Vector<Embe
   layoutParameters.numberOfGlyphs = numberOfGlyphs;
   layoutParameters.startLineIndex = 0u;
   layoutParameters.estimatedNumberOfLines = 1u;
+  layoutParameters.interGlyphExtraAdvance = 0.f;
 
   // Update the visual model.
   Size newLayoutSize;
@@ -801,8 +802,6 @@ Devel::PixelBuffer Render( const RendererParameters& textParameters, Vector<Embe
   // Set the position of the embedded items (if there is any).
   EmbeddedItemInfo* embeddedItemLayoutBuffer = embeddedItemLayout.Begin();
 
-  auto transformToArc = isClockwise ? &Dali::TextAbstraction::TransformToArcClockwise : &Dali::TextAbstraction::TransformToArcAntiClockwise;
-
   for( Length index = 0u, endIndex = embeddedItemLayout.Count(); index < endIndex; ++index )
   {
     EmbeddedItemInfo& embeddedItem = *( embeddedItemLayoutBuffer + index );
@@ -841,7 +840,7 @@ Devel::PixelBuffer Render( const RendererParameters& textParameters, Vector<Embe
       }
       embeddedItem.angle = Degree( Radian( radians ) );
 
-      transformToArc( circularTextParameters, centerX, centerY );
+      Dali::TextAbstraction::TransformToArc( circularTextParameters, centerX, centerY );
 
       // Recalculate the size of the embedded item after the rotation to position it correctly.
       float width = embeddedItem.size.width;
@@ -1282,6 +1281,10 @@ void UpdateBuffer(Devel::PixelBuffer src, Devel::PixelBuffer dst, unsigned int x
   }
 
   const unsigned int bytesPerPixel = Dali::Pixel::GetBytesPerPixel(pixelFormat);
+  if( bytesPerPixel == 0u )
+  {
+    return;
+  }
   const unsigned int alphaIndex = bytesPerPixel - 1u;
 
   const unsigned char* const srcBuffer = src.GetBuffer();