Merge "DALi Version 2.0.25" into devel/master

diff --git a/automated-tests/resources/juice.riv b/automated-tests/resources/juice.riv
deleted file mode 100644 (file)
index 80003ec..0000000
Binary files a/automated-tests/resources/juice.riv and /dev/null differ

diff --git a/automated-tests/resources/shape.riv b/automated-tests/resources/shape.riv
new file mode 100644 (file)
index 0000000..2450a94
Binary files /dev/null and b/automated-tests/resources/shape.riv differ

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
index 9565d09..83c6a09 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
@@ -53,7 +53,7 @@ const char* TEST_VECTOR_IMAGE_FILE_NAME =  TEST_RESOURCE_DIR  "/insta_camera.jso
 const char* TEST_VECTOR_IMAGE_FILE_NAME_FRAME_DROP = "framedrop.json";
 const char* TEST_VECTOR_IMAGE_INVALID_FILE_NAME =  "invalid.json";
 
-const char* TEST_VECTOR_IMAGE_RIVE_FILE_NAME =  TEST_RESOURCE_DIR  "/juice.riv";
+const char* TEST_VECTOR_IMAGE_RIVE_FILE_NAME =  TEST_RESOURCE_DIR  "/shape.riv";
 const char* TEST_VECTOR_IMAGE_INVALID_RIVE_FILE_NAME = "invalid.riv";
 
 bool gAnimationFinishedSignalFired = false;