diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-07 16:12:53 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-07 16:14:42 +0300 |
| commit | 680fcd09b145b56dd6112eb9be901e5b558ab94d (patch) | |
| tree | 223aa4c66d0b72ece299c1a003793e8a027c4bd3 | |
| parent | 269124ec2624ee9185391e7529ec7eaa4173d8e7 (diff) | |
| download | qtlocation-mapboxgl-680fcd09b145b56dd6112eb9be901e5b558ab94d.tar.gz | |
Revert "[core] Use release() instead of get()/reset() in Raster"
No one owned the data after release(), so this wasn't being free'd.
reset() does that, thus this patch causes a huge memory leak.
| -rw-r--r-- | src/mbgl/util/raster.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/util/raster.cpp b/src/mbgl/util/raster.cpp index 514472010f..3146a00513 100644 --- a/src/mbgl/util/raster.cpp +++ b/src/mbgl/util/raster.cpp @@ -59,6 +59,7 @@ void Raster::upload(gl::ObjectStore& store) { #endif MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); MBGL_CHECK_ERROR(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); - MBGL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, img.data.release())); + MBGL_CHECK_ERROR(glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, img.data.get())); + img.data.reset(); } } |