projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix documentation for Text::EditableControlInterface interface override functi...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
fixed-image-cache.h
diff --git
a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
index
ceb9fff
..
ec7f419
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
+++ b/
dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_FIXED_IMAGE_CACHE_H
/*
#define DALI_TOOLKIT_INTERNAL_FIXED_IMAGE_CACHE_H
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-46,7
+46,13
@@
public:
ImageCache::FrameReadyObserver& observer,
unsigned int batchSize );
ImageCache::FrameReadyObserver& observer,
unsigned int batchSize );
- virtual ~FixedImageCache();
+ ~FixedImageCache() override;
+
+ /**
+ * Get the Nth frame. If it's not ready, this will trigger the
+ * sending of FrameReady() when the image becomes ready.
+ */
+ TextureSet Frame( uint32_t frameIndex ) override;
/**
* Get the first frame. If it's not ready, this will trigger the
/**
* Get the first frame. If it's not ready, this will trigger the
@@
-55,11
+61,9
@@
public:
TextureSet FirstFrame() override;
/**
TextureSet FirstFrame() override;
/**
- * Get the next frame. If it's not ready, this will trigger the
- * sending of FrameReady() when the image becomes ready.
- * This will trigger the loading of the next batch.
+ * Get the interval of Nth frame.
*/
*/
-
TextureSet NextFrame(
) override;
+
uint32_t GetFrameInterval( uint32_t frameIndex
) override;
private:
/**
private:
/**
@@
-96,7
+100,13
@@
protected:
TextureSet textureSet,
bool useAtlasing,
const Vector4& atlasRect,
TextureSet textureSet,
bool useAtlasing,
const Vector4& atlasRect,
- bool premultiplied) override;
+ bool premultiplied ) override;
+
+ void LoadComplete(
+ bool loadSuccess,
+ Devel::PixelBuffer pixelBuffer,
+ const VisualUrl& url,
+ bool preMultiplied ) override;
private:
std::vector<UrlStore>& mImageUrls;
private:
std::vector<UrlStore>& mImageUrls;