tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disallow changing an existing Sprite's size

Browse Source
This commit is contained in:
Konstantin Käfer
2015-06-26 12:17:35 +02:00
parent 086e72afe3
commit aa2dcf1968
2 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mbgl/annotation/sprite_store.cpp
View File

@@ -17,15 +17,21 @@ void SpriteStore::setSprite(const std::string& name, std::shared_ptr<const Sprit
void SpriteStore::_setSprite(const std::string& name,
const std::shared_ptr<const SpriteImage>& sprite) {
if (sprite) {
if (sprite->pixelRatio == pixelRatio) {
sprites.emplace(name, sprite);
dirty.emplace(name, sprite);
return;
} else {
if (sprite->pixelRatio != pixelRatio) {
Log::Warning(Event::Sprite, "Sprite image has wrong pixel ratio");
return;
}
}
if (sprites.erase(name) > 0) {
auto it = sprites.find(name);
if (it != sprites.end() &&
(it->second->width != sprite->width || it->second->height != sprite->height)) {
Log::Warning(Event::Sprite, "Can't change sprite dimensions");
return;
}
sprites.emplace_hint(it, name, sprite);
dirty.emplace(name, sprite);
} else if (sprites.erase(name) > 0) {
dirty.emplace(name, nullptr);
}
}

25
test/annotations/sprite_store.cpp
View File

@@ -89,3 +89,28 @@ TEST(Annotations, SpriteStoreMultiple) {
store.getDirty());
EXPECT_EQ(Sprites(), store.getDirty());
}
TEST(Annotations, SpriteStoreReplaceWithDifferentDimensions) {
FixtureLog log;
const auto sprite1 = std::make_shared<SpriteImage>(8, 8, 2, std::string(16 * 16 * 4, '\0'));
const auto sprite2 = std::make_shared<SpriteImage>(9, 9, 2, std::string(18 * 18 * 4, '\0'));
using Sprites = std::map<std::string, std::shared_ptr<const SpriteImage>>;
SpriteStore store(2);
store.setSprite("sprite", sprite1);
store.setSprite("sprite", sprite2);
EXPECT_EQ(1u, log.count({
EventSeverity::Warning,
Event::Sprite,
int64_t(-1),
"Can't change sprite dimensions",
}));
EXPECT_EQ(sprite1, store.getSprite("sprite"));
EXPECT_EQ(Sprites({ { "sprite", sprite1 } }), store.getDirty());
}