Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/base/StarAssets.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/base/StarAssets.cpp')
-rw-r--r--source/base/StarAssets.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/source/base/StarAssets.cpp b/source/base/StarAssets.cpp
index 6bd9c09..e5313ea 100644
--- a/source/base/StarAssets.cpp
+++ b/source/base/StarAssets.cpp
@@ -234,11 +234,10 @@ void Assets::queueJsons(StringList const& paths) const {
}));
}
-ImageConstPtr Assets::image(String const& path) const {
- auto components = AssetPath::split(path);
- validatePath(components, true, true);
+ImageConstPtr Assets::image(AssetPath const& path) const {
+ validatePath(path, true, true);
- return as<ImageData>(getAsset(AssetId{AssetType::Image, move(components)}))->image;
+ return as<ImageData>(getAsset(AssetId{AssetType::Image, path}))->image;
}
void Assets::queueImages(StringList const& paths) const {
@@ -250,11 +249,10 @@ void Assets::queueImages(StringList const& paths) const {
}));
}
-ImageConstPtr Assets::tryImage(String const& path) const {
- auto components = AssetPath::split(path);
- validatePath(components, true, true);
+ImageConstPtr Assets::tryImage(AssetPath const& path) const {
+ validatePath(path, true, true);
- if (auto imageData = as<ImageData>(tryAsset(AssetId{AssetType::Image, move(components)})))
+ if (auto imageData = as<ImageData>(tryAsset(AssetId{AssetType::Image, path})))
return imageData->image;
else
return {};