X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageAtlas.cpp;h=b605fc4ec43a0f97ea9e27ac03dcc671e3e18b9e;hp=848a2821dea8ba8a37afc03ac5b9e8184f51d181;hb=5e351965bad7e1de2e94027548b022bac692603c;hpb=963a9277aba27b289d604503201775e5fc925bc3 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp index 848a282..b605fc4 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,6 @@ #include #include #include -#include - -#include #include using namespace Dali; @@ -399,14 +396,14 @@ int UtcDaliImageAtlasImageView(void) imageMap1[ ImageVisual::Property::URL ] = gImage_34_RGBA; imageMap1[ ImageVisual::Property::DESIRED_HEIGHT ] = 34; imageMap1[ ImageVisual::Property::DESIRED_WIDTH ] = 34; - imageMap1[ DevelImageVisual::Property::ATLASING] = true; + imageMap1[ ImageVisual::Property::ATLASING] = true; Property::Map imageMap2; imageMap2[ ImageVisual::Property::URL ] = gImage_50_RGBA; imageMap2[ ImageVisual::Property::DESIRED_HEIGHT ] = 50; imageMap2[ ImageVisual::Property::DESIRED_WIDTH ] = 50; - imageMap2[ DevelImageVisual::Property::ATLASING ] = true; + imageMap2[ ImageVisual::Property::ATLASING ] = true; ImageView imageView1 = ImageView::New(); imageView1.SetProperty( ImageView::Property::IMAGE, imageMap1 ); @@ -460,7 +457,7 @@ int UtcDaliImageAtlasImageView(void) imageMap3[ ImageVisual::Property::URL ] = gImage_128_RGB; imageMap3[ ImageVisual::Property::DESIRED_HEIGHT ] = 100; imageMap3[ ImageVisual::Property::DESIRED_WIDTH ] = 100; - imageMap3[ DevelImageVisual::Property::ATLASING ] = true; + imageMap3[ ImageVisual::Property::ATLASING ] = true; ImageView imageView3 = ImageView::New(); imageView3.SetProperty( ImageView::Property::IMAGE, imageMap3 );