X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fimage-loader%2Fimage-atlas.cpp;h=84903b3a40eb827686175994f03f4cdde47ef5cc;hb=8a313bb71bb0d1b443e2b5d7f383155433d385e0;hp=a7174d5d2a379d81fba4710a474538b0d81757c6;hpb=3eb60a0aef6b188727b79bdee2e35c575c432a90;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/image-loader/image-atlas.cpp b/dali-toolkit/devel-api/image-loader/image-atlas.cpp index a7174d5..84903b3 100644 --- a/dali-toolkit/devel-api/image-loader/image-atlas.cpp +++ b/dali-toolkit/devel-api/image-loader/image-atlas.cpp @@ -35,6 +35,11 @@ ImageAtlas::~ImageAtlas() { } +Texture ImageAtlas::PackToAtlas( const std::vector& pixelData, Dali::Vector& textureRects ) +{ + return Internal::ImageAtlas::PackToAtlas( pixelData, textureRects ); +} + ImageAtlas::ImageAtlas(Internal::ImageAtlas* internal) : BaseHandle( internal ) { @@ -80,7 +85,17 @@ bool ImageAtlas::Upload( Vector4& textureRect, FittingMode::Type fittingMode, bool orientationCorrection ) { - return GetImplementation(*this).Upload( textureRect, url, size, fittingMode, orientationCorrection ); + return Upload( textureRect, url, size, fittingMode, orientationCorrection, NULL ); +} + +bool ImageAtlas::Upload( Vector4& textureRect, + const std::string& url, + ImageDimensions size, + FittingMode::Type fittingMode, + bool orientationCorrection, + AtlasUploadObserver* atlasUploadObserver ) +{ + return GetImplementation(*this).Upload( textureRect, url, size, fittingMode, orientationCorrection, atlasUploadObserver ); } bool ImageAtlas::Upload( Vector4& textureRect, PixelData pixelData )