X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-scroller.cpp;h=b3c56de7cb45e4789eaf3356260a9f6682371a96;hb=81ea89b9722ab7d1c02e43da9c2de5eefef32659;hp=3c9b450dbf8d05e4d8da11755647811b41b11983;hpb=09ec2dff1daaedd159d390673776617840492066;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp index 3c9b450..b3c56de 100644 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -19,14 +19,15 @@ #include // EXTERNAL INCLUDES -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include // INTERNAL INCLUDES #include @@ -165,13 +166,13 @@ void CreateGeometry( Geometry& geometry ) */ void CreateRenderer( FrameBufferImage frameBufferImage, Dali::Renderer& renderer ) { - Shader shader = Shader::New( VERTEX_SHADER_SCROLL , FRAGMENT_SHADER, Shader::HINT_NONE ); + Shader shader = Shader::New( VERTEX_SHADER_SCROLL , FRAGMENT_SHADER, Shader::Hint::NONE ); Sampler sampler = Sampler::New(); sampler.SetFilterMode(FilterMode::NEAREST, FilterMode::NEAREST ); TextureSet textureSet = TextureSet::New(); - textureSet.SetImage( 0u, frameBufferImage ); + TextureSetImage( textureSet, 0u, frameBufferImage ); textureSet.SetSampler( 0u, sampler ); Geometry meshGeometry;