Skip to content

Allow empty key in loadFromData #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nokeya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow empty key in loadFromData #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions inc/rlottie.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ class RLOTTIE_API Animation {
* @internal
*/
static std::unique_ptr<Animation>
loadFromData(std::string jsonData, const std::string &key,
const std::string &resourcePath="", bool cachePolicy=true);
loadFromData(std::string jsonData, const std::string &key = std::string(),
const std::string &resourcePath = std::string(), bool cachePolicy=true);

/**
* @brief Constructs an animation object from JSON string data and update.
Expand Down
5 changes: 3 additions & 2 deletions src/lottie/lottieloader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,16 @@ std::shared_ptr<model::Composition> model::loadFromData(
std::string jsonData, const std::string &key, std::string resourcePath,
bool cachePolicy)
{
if (cachePolicy) {
if (cachePolicy && !key.empty()) {
auto obj = ModelCache::instance().find(key);
if (obj) return obj;
}

auto obj = internal::model::parse(const_cast<char *>(jsonData.c_str()),
std::move(resourcePath));

if (obj && cachePolicy) ModelCache::instance().add(key, obj);
if (obj && cachePolicy && !key.empty())
ModelCache::instance().add(key, obj);

return obj;
}
Expand Down