Merge "Moved TextureSet::SetImage() to separate devel-api module" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-scroller.cpp

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index 1201619..605e5b1 100644 (file)
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -19,6 +19,7 @@
 #include <dali-toolkit/internal/text/text-scroller.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/images/texture-set-image.h>
 #include <dali/devel-api/rendering/geometry.h>
 #include <dali/devel-api/rendering/renderer.h>
 #include <dali/devel-api/rendering/sampler.h>
@@ -171,7 +172,7 @@ void CreateRenderer( FrameBufferImage frameBufferImage, Dali::Renderer& renderer
   sampler.SetFilterMode(FilterMode::NEAREST, FilterMode::NEAREST );
 
   TextureSet textureSet = TextureSet::New();
-  textureSet.SetImage( 0u, frameBufferImage );
+  TextureSetImage( textureSet, 0u, frameBufferImage );
   textureSet.SetSampler( 0u, sampler );
 
   Geometry meshGeometry;
@@ -197,12 +198,12 @@ TextScrollerPtr TextScroller::New( ScrollerInterface& scrollerInterface )
 void TextScroller::SetGap( int gap )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetGap gap[%d]\n", gap );
-  mWrapGap = gap;
+  mWrapGap = static_cast<float>(gap);
 }
 
 int TextScroller::GetGap() const
 {
-  return mWrapGap;
+  return static_cast<int>(mWrapGap);
 }
 
 void TextScroller::SetSpeed( int scrollSpeed )
@@ -252,7 +253,7 @@ TextScroller::TextScroller( ScrollerInterface& scrollerInterface ) : mScrollerIn
                             mScrollDeltaIndex( Property::INVALID_INDEX ),
                             mScrollSpeed( MINIMUM_SCROLL_SPEED ),
                             mLoopCount( 1 ),
-                            mWrapGap( 0 )
+                            mWrapGap( 0.0f )
 {
   DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller Default Constructor\n" );
 }
@@ -286,7 +287,7 @@ void TextScroller::SetParameters( Actor sourceActor, const Size& controlSize, co
 
   mOffscreenCameraActor.SetY( offScreenSize.height * 0.5f );
 
-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters mWrapGap[%d]\n", mWrapGap )
+  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "TextScroller::SetParameters mWrapGap[%f]\n", mWrapGap )
 
   mScrollingTextActor = Actor::New();
   mScrollingTextActor.AddRenderer( renderer );