return reference to DEMData instead of pointer

6 files changed, 10 insertions, 10 deletions

diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake
index 2191852b41..73f1546308 100644
--- a/cmake/test-files.cmake
+++ b/cmake/test-files.cmake
@@ -22,7 +22,7 @@ set(MBGL_TEST_FILES
     test/api/zoom_history.cpp
 
     # geometry
-    test/geometry/dem_pyramid.test.cpp
+    test/geometry/dem_data.test.cpp
 
     # gl
     test/gl/bucket.test.cpp
diff --git a/src/mbgl/geometry/dem_data.cpp b/src/mbgl/geometry/dem_data.cpp
index cb5bb0695d..4ab72fcf80 100644
--- a/src/mbgl/geometry/dem_data.cpp
+++ b/src/mbgl/geometry/dem_data.cpp
@@ -42,7 +42,7 @@ DEMData::DEMData(PremultipliedImage& image):
     loaded = true;
 }
 
-void DEMData::backfillBorder(mbgl::DEMData& borderTileData, int8_t dx, int8_t dy) {
+void DEMData::backfillBorder(DEMData& borderTileData, int8_t dx, int8_t dy) {
     auto& t = level;
     auto& o = borderTileData.level;
     assert(t.dim == o.dim);
diff --git a/src/mbgl/geometry/dem_data.hpp b/src/mbgl/geometry/dem_data.hpp
index e29d204a7d..ddb8939bb2 100644
--- a/src/mbgl/geometry/dem_data.hpp
+++ b/src/mbgl/geometry/dem_data.hpp
@@ -47,7 +47,7 @@ public:
     
     DEMData(PremultipliedImage& image);
     void backfillBorder(DEMData& borderTileData, int8_t dx, int8_t dy);
-    bool isLoaded() {
+    bool isLoaded() const {
         return loaded;
     };
     Level level;
diff --git a/src/mbgl/renderer/buckets/hillshade_bucket.cpp b/src/mbgl/renderer/buckets/hillshade_bucket.cpp
index 65d102f1f9..b883a4fecf 100644
--- a/src/mbgl/renderer/buckets/hillshade_bucket.cpp
+++ b/src/mbgl/renderer/buckets/hillshade_bucket.cpp
@@ -14,8 +14,8 @@ HillshadeBucket::HillshadeBucket(PremultipliedImage&& image_): demdata(image_) {
 HillshadeBucket::HillshadeBucket(DEMData&& demdata_) : demdata(std::move(demdata_)) {
 }
 
-DEMData* HillshadeBucket::getDEMData() {
-    return &demdata;
+DEMData& HillshadeBucket::getDEMData() {
+    return demdata;
 }
 
 void HillshadeBucket::upload(gl::Context& context) {
diff --git a/src/mbgl/renderer/buckets/hillshade_bucket.hpp b/src/mbgl/renderer/buckets/hillshade_bucket.hpp
index 76cf9a7920..09f1bcb375 100644
--- a/src/mbgl/renderer/buckets/hillshade_bucket.hpp
+++ b/src/mbgl/renderer/buckets/hillshade_bucket.hpp
@@ -32,7 +32,7 @@ public:
 
     TileMask mask{ { 0, 0, 0 } };
     bool prepared = false;
-    DEMData* getDEMData();
+    DEMData& getDEMData();
 
     // Raster-DEM Tile Sources use the default buffers from Painter
     gl::VertexVector<HillshadeLayoutVertex> vertices;
diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp
index ac11b38917..563e2aee60 100644
--- a/src/mbgl/renderer/sources/render_raster_dem_source.cpp
+++ b/src/mbgl/renderer/sources/render_raster_dem_source.cpp
@@ -77,11 +77,11 @@ static void fillBorder(RasterDEMTile& tile, const RasterDEMTile& borderTile, con
     }
     HillshadeBucket* borderBucket = borderTile.getBucket();
     HillshadeBucket* tileBucket = tile.getBucket();
-    DEMData* tileDEM = tileBucket->getDEMData();
-    DEMData* borderDEM = borderBucket->getDEMData();
+    DEMData& tileDEM = tileBucket->getDEMData();
+    DEMData& borderDEM = borderBucket->getDEMData();
 
-    if (tileDEM->isLoaded() && borderDEM->isLoaded()){
-        tileDEM->backfillBorder(*borderDEM, dx, dy);
+    if (tileDEM.isLoaded() && borderDEM.isLoaded()){
+        tileDEM.backfillBorder(borderDEM, dx, dy);
         // update the bitmask to indicate that this tiles have been backfilled by flipping the relevant bit
         tile.neighboringTiles = tile.neighboringTiles | mask;
         // mark HillshadeBucket.prepared as false so it runs through the prepare render pass