X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=shared%2Futility.h;h=76a814b820c26b021e99208d358a28c19d048f3f;hb=0931829b57d37a5c39d38e7b529f1886bef5f92f;hp=ece33270889f94bae7fc0b9e5f1bf7a7f0c2b520;hpb=94eed471ec67c870ac8c6aee8acb3963b17e76b7;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/shared/utility.h b/shared/utility.h index ece3327..76a814b 100644 --- a/shared/utility.h +++ b/shared/utility.h @@ -19,7 +19,6 @@ */ #include -#include #include #include #include @@ -37,17 +36,6 @@ Dali::PixelData LoadPixelData( const char* imagePath, return loader.GetPixelData(); } -/** - * @deprecated, dont use this anymore - */ -Dali::Image LoadImage( const char* imagePath, - Dali::ImageDimensions size = Dali::ImageDimensions(), - Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT, - Dali::SamplingMode::Type samplingMode = Dali::SamplingMode::DEFAULT ) -{ - return Dali::ResourceImage::New( imagePath, size, fittingMode, samplingMode ); -} - Dali::Texture LoadTexture( const char* imagePath, Dali::ImageDimensions size = Dali::ImageDimensions(), Dali::FittingMode::Type fittingMode = Dali::FittingMode::DEFAULT, @@ -63,23 +51,6 @@ Dali::Texture LoadTexture( const char* imagePath, return texture; } -/** - * @brief Load an bitmap resource. - * @deprecated, dont use this anymore - * - * If it is required to scaled-down to no more than the stage dimensions, - * uses image scaling mode FittingMode::SCALE_TO_FILL to resize the image at - * load time to cover the entire stage with pixels with no borders, - * and filter mode BOX_THEN_LINEAR to sample the image with - * maximum quality. - */ - -Dali::Image LoadStageFillingImage( const char* imagePath ) -{ - Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize(); - return LoadImage( imagePath, Dali::ImageDimensions( stageSize.x, stageSize.y ), Dali::FittingMode::SCALE_TO_FILL, Dali::SamplingMode::BOX_THEN_LINEAR ); -} - Dali::Texture LoadStageFillingTexture( const char* imagePath ) { Dali::Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();