Fixes for review comments

mapbox · Feb 16, 2020 · 4649732 · 4649732
1 parent 0645140
commit 4649732
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/mbgl/sprite/sprite_parser.cpp b/src/mbgl/sprite/sprite_parser.cpp
@@ -199,7 +199,7 @@ std::vector<Immutable<style::Image::Impl>> parseSprite(const std::string& encode
     }
 
     assert([&images] {
-        std::sort(images.begin(), images.end(), [](const auto& a, const auto& b) { return a->id < b->id; });
+        std::sort(images.begin(), images.end());
         return std::unique(images.begin(), images.end()) == images.end();
     }());
     return images;

diff --git a/src/mbgl/style/image_impl.hpp b/src/mbgl/style/image_impl.hpp
@@ -48,5 +48,8 @@ using ImageMap = std::unordered_map<std::string, Immutable<style::Image::Impl>>;
 using ImageDependencies = std::unordered_map<std::string, ImageType>;
 using ImageRequestPair = std::pair<ImageDependencies, uint64_t>;
 using ImageVersionMap = std::unordered_map<std::string, uint32_t>;
+inline bool operator<(const Immutable<mbgl::style::Image::Impl>& a, const Immutable<mbgl::style::Image::Impl>& b) {
+    return a->id < b->id;
+}
 
 } // namespace mbgl
diff --git a/src/mbgl/style/style_impl.cpp b/src/mbgl/style/style_impl.cpp
@@ -341,13 +341,12 @@ void Style::Impl::onSourceDescriptionChanged(Source& source) {
 
 void Style::Impl::onSpriteLoaded(std::vector<Immutable<style::Image::Impl>> images_) {
     auto newImages = makeMutable<ImageImpls>(*images);
-    const auto cmp = [](const auto& a, const auto& b) { return a->id < b->id; };
-    assert(std::is_sorted(newImages->begin(), newImages->end(), cmp));
+    assert(std::is_sorted(newImages->begin(), newImages->end()));
 
     for (auto it = images_.begin(); it != images_.end();) {
         const auto& image = *it;
-        auto first = std::lower_bound(newImages->begin(), newImages->end(), image, cmp);
-        auto found = first != newImages->end() && !cmp(image, *first) ? first : newImages->end();
+        auto first = std::lower_bound(newImages->begin(), newImages->end(), image);
+        auto found = first != newImages->end() && !(image < *first) ? first : newImages->end();
         if (found != newImages->end()) {
             *found = std::move(*it);
             it = images_.erase(it);
@@ -358,7 +357,7 @@ void Style::Impl::onSpriteLoaded(std::vector<Immutable<style::Image::Impl>> imag
 
     newImages->insert(
         newImages->end(), std::make_move_iterator(images_.begin()), std::make_move_iterator(images_.end()));
-    std::sort(newImages->begin(), newImages->end(), cmp);
+    std::sort(newImages->begin(), newImages->end());
     images = std::move(newImages);
     spriteLoaded = true;
     observer->onUpdate(); // For *-pattern properties.