From 2849cd1b653fa6d1463131c8ce7532d7627de218 Mon Sep 17 00:00:00 2001 From: Richard Underhill Date: Thu, 12 Mar 2015 14:18:38 +0000 Subject: [PATCH] Corrected camel case for BgraShader Change-Id: If8c8939d8739d0fba5897e71643ffe3f4592a28e Signed-off-by: Richard Underhill --- dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp | 2 +- dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp | 2 +- dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp b/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp index 31ab53f..dc6ec3e 100644 --- a/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/basic/text-basic-renderer.cpp @@ -369,7 +369,7 @@ RenderableActor BasicRenderer::Render( Text::ViewInterface& view ) actorBGRA8888 = MeshActor::New( mImpl->CreateMesh( glyphs, positions, Pixel::BGRA8888, mImpl->mAtlasBGRA8888 ) ); actorBGRA8888.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); - ShaderEffect shader = BGRAShader::New(); + ShaderEffect shader = BgraShader::New(); actorBGRA8888.SetShaderEffect( shader ); } diff --git a/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp b/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp index 43f61d5..7f2f2a5 100644 --- a/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp +++ b/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.cpp @@ -27,7 +27,7 @@ namespace Toolkit namespace Text { -namespace BGRAShader +namespace BgraShader { Dali::ShaderEffect New() diff --git a/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.h b/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.h index 70e3c67..16293c6 100644 --- a/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.h +++ b/dali-toolkit/internal/text/rendering/shaders/text-bgra-shader.h @@ -34,7 +34,7 @@ namespace Text /** * @brief A BGRA shader for rendering glyphs. */ -namespace BGRAShader +namespace BgraShader { /** -- 2.7.4