From 1ec5c447e248403f0eae38cbcf17e95a431a2296 Mon Sep 17 00:00:00 2001 From: David Steele Date: Wed, 19 Jul 2017 20:52:16 +0100 Subject: [PATCH] Updated alpha blend demo to handle scale/crop Change-Id: I6ddbf61182eb8cb01ce5b25699e747fcab6c68b2 --- .../alpha-blending-cpu/alpha-blending-cpu-example.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp index ce1f0a2..35a71fc 100644 --- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp +++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp @@ -28,8 +28,8 @@ const char* const IMAGE_PATH_1 ( DEMO_IMAGE_DIR "people-small-7b.jpg" ); // 100x const char* const IMAGE_PATH_2 ( DEMO_IMAGE_DIR "people-medium-7.jpg" ); const char* const IMAGE_PATH_3 ( DEMO_IMAGE_DIR "people-medium-7-rgb565.png" ); // is compressed const char* const IMAGE_PATH_4 ( DEMO_IMAGE_DIR "people-medium-7-masked.png" ); // has alpha channel -const char* const MASK_IMAGE_PATH_1 ( DEMO_IMAGE_DIR "store_mask_profile_f.png" ); -const char* const MASK_IMAGE_PATH_2 ( DEMO_IMAGE_DIR "store_mask_profile_n.png" ); // 300x300 +const char* const MASK_IMAGE_PATH_1 ( DEMO_IMAGE_DIR "store_mask_profile_n.png" ); // 300x300 +const char* const MASK_IMAGE_PATH_2 ( DEMO_IMAGE_DIR "store_mask_profile_f.png" ); } class ImageViewAlphaBlendApp : public ConnectionTracker @@ -108,10 +108,23 @@ private: const char* mask = masks[mImageCombinationIndex%2 ]; // Cycle through masks const char* image = images[(mImageCombinationIndex/2)%4]; // then images + Property::Map map; map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::Type::IMAGE ); map.Add( Toolkit::ImageVisual::Property::URL, image ); map.Add( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mask ); + + if( mImageCombinationIndex%2 == 0 ) + { + map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.f ); + map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, false ); + } + else + { + map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.6f ); + map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, true ); + } + mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map ); mImageLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, strrchr(image, '/') ); -- 2.7.4