From c6e80201da6bb5b7cc8864650b5bac8ff95e9e6a Mon Sep 17 00:00:00 2001 From: Ferran Sole Date: Thu, 26 Jan 2017 16:54:02 +0000 Subject: [PATCH] Removed unused method GetTexture form test-actor-utils.h Change-Id: Ie25c441c32cd632834c3d9ef2c412d0f16cbae71 --- .../dali-toolkit-test-utils/test-actor-utils.cpp | 19 ------------------- .../dali-toolkit-test-utils/test-actor-utils.h | 7 ------- 2 files changed, 26 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp index 6e2e204..38eb0b22 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp @@ -94,23 +94,4 @@ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, con return actor; } -Image GetTexture( Actor actor ) -{ - Image image; - if( actor && actor.GetRendererCount() ) - { - Renderer renderer = actor.GetRendererAt( 0u ); - if( renderer ) - { - TextureSet textureSet = renderer.GetTextures(); - if( textureSet && textureSet.GetTextureCount() ) - { - image = TextureGetImage( textureSet, 0u ); - } - } - } - - return image; -} - } // namespace Dali diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h index 28953cb..a62dcca 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.h @@ -49,13 +49,6 @@ Actor CreateRenderableActor( Image texture ); */ Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader ); -/** - * @brief Retrieves the texture used in a renderable actor (if available). - * @return The texture used by the actor. - * @note Assumes the actor only has one renderer, and that renderer only has one texture. - */ -Image GetTexture( Actor actor ); - } // namespace Dali #endif // DALI_TEST_ACTOR_UTILS_H -- 2.7.4