summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRomain Quidet <romain.quidet.ext@mappy.com>2015-12-15 11:56:03 +0100
committerMinh Nguyễn <mxn@1ec5.org>2015-12-15 16:36:17 -0800
commitb8be1f0632bf3ba2daf128c55692f7956af606cb (patch)
tree3fe27395a7afae7e6c2aa2387f73456c6df41fc5 /src
parentaf45d87e54e36f9899507d31c4b79669a254350e (diff)
downloadqtlocation-mapboxgl-b8be1f0632bf3ba2daf128c55692f7956af606cb.tar.gz
code review updates: sprite_atlas brackets and nullable removed for reuseIdentifier of annotationImage
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/sprite/sprite_atlas.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mbgl/sprite/sprite_atlas.cpp b/src/mbgl/sprite/sprite_atlas.cpp
index b04d8edc5f..202218f51c 100644
--- a/src/mbgl/sprite/sprite_atlas.cpp
+++ b/src/mbgl/sprite/sprite_atlas.cpp
@@ -187,12 +187,9 @@ void SpriteAtlas::updateDirty() {
// The two names match;
Holder& holder = imageIterator->second;
holder.texture = spriteIterator->second;
- if (holder.texture != nullptr)
- {
+ if (holder.texture != nullptr) {
copy(holder, imageIterator->first.second);
- }
- else
- {
+ } else {
images.erase(imageIterator);
}