[core] Use fixed-size std::array for ImageSource coordinates

2 files changed, 5 insertions, 9 deletions

diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp
index 975b08eb47..3fec926b7f 100644
--- a/src/mbgl/renderer/sources/render_image_source.cpp
+++ b/src/mbgl/renderer/sources/render_image_source.cpp
@@ -16,6 +16,8 @@ RenderImageSource::RenderImageSource(Immutable<style::ImageSource::Impl> impl_)
     : RenderSource(impl_), shouldRender(false) {
 }
 
+RenderImageSource::~RenderImageSource() = default;
+
 const style::ImageSource::Impl& RenderImageSource::impl() const {
     return static_cast<const style::ImageSource::Impl&>(*baseImpl);
 }
@@ -127,10 +129,7 @@ void RenderImageSource::updateTiles(const TileParameters& parameters) {
         auto gc = TileCoordinate::toGeometryCoordinate(tileIds[0], tc.p);
         geomCoords.push_back(gc);
     }
-    setupBucket(geomCoords);
-}
-
-void RenderImageSource::setupBucket(GeometryCoordinates& geomCoords) {
+    
     if (!bucket) {
         UnassociatedImage img = impl().getImage().clone();
         if (!img.valid()) {
diff --git a/src/mbgl/renderer/sources/render_image_source.hpp b/src/mbgl/renderer/sources/render_image_source.hpp
index 769f932f27..86c17b10fd 100644
--- a/src/mbgl/renderer/sources/render_image_source.hpp
+++ b/src/mbgl/renderer/sources/render_image_source.hpp
@@ -1,16 +1,13 @@
 #pragma once
 
-#include <mbgl/renderer/buckets/raster_bucket.hpp>
 #include <mbgl/renderer/render_source.hpp>
 #include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/style/sources/image_source_impl.hpp>
-#include <mbgl/tile/geometry_tile_data.hpp>
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/optional.hpp>
 
 namespace mbgl {
 class RenderLayer;
 class PaintParameters;
+class RasterBucket;
 
 namespace gl {
 class Context;
@@ -19,6 +16,7 @@ class Context;
 class RenderImageSource : public RenderSource {
 public:
     RenderImageSource(Immutable<style::ImageSource::Impl>);
+    ~RenderImageSource() override;
 
     bool isLoaded() const final;
     void upload(gl::Context&);
@@ -59,7 +57,6 @@ public:
 
 private:
     const style::ImageSource::Impl& impl() const;
-    void setupBucket(GeometryCoordinates& coordiantes);
     std::map<UnwrappedTileID, RenderTile> tiles;
 
     std::vector<UnwrappedTileID> tileIds;