From a647b42712bec653ba41f8ffadbc412c6363e6ef Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 13 Sep 2017 11:07:38 -0400 Subject: [core] Clear atlasImage rect for a removed pattern --- mapbox-gl-js | 2 +- platform/node/test/ignores.json | 1 + src/mbgl/renderer/image_manager.cpp | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mapbox-gl-js b/mapbox-gl-js index 991ab7d1a1..c346dec5e3 160000 --- a/mapbox-gl-js +++ b/mapbox-gl-js @@ -1 +1 @@ -Subproject commit 991ab7d1a190a5a54e1f8f54e179dd302ecae493 +Subproject commit c346dec5e3b55257820f1377a139579982bc95ff diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index a8f5a1c7b1..a6e43da0b3 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -41,6 +41,7 @@ "render-tests/regressions/mapbox-gl-js#3548": "skip - needs issue", "render-tests/regressions/mapbox-gl-js#3682": "https://github.com/mapbox/mapbox-gl-js/issues/3682", "render-tests/regressions/mapbox-gl-native#7357": "https://github.com/mapbox/mapbox-gl-native/issues/7357", + "render-tests/regressions/mapbox-gl-native#9900": "skip - https://github.com/mapbox/mapbox-gl-native/pull/9905", "render-tests/runtime-styling/image-add-sdf": "skip - https://github.com/mapbox/mapbox-gl-native/issues/9847", "render-tests/runtime-styling/paint-property-fill-flat-to-extrude": "skip - https://github.com/mapbox/mapbox-gl-native/issues/6745", "render-tests/runtime-styling/set-style-paint-property-fill-flat-to-extrude": "skip - needs issue", diff --git a/src/mbgl/renderer/image_manager.cpp b/src/mbgl/renderer/image_manager.cpp index 365a2742de..4aa18e693a 100644 --- a/src/mbgl/renderer/image_manager.cpp +++ b/src/mbgl/renderer/image_manager.cpp @@ -39,6 +39,14 @@ void ImageManager::removeImage(const std::string& id) { auto it = patterns.find(id); if (it != patterns.end()) { + // Clear pattern from the atlas image. + const uint32_t w = it->second.bin->w; + const uint32_t h = it->second.bin->h; + const uint32_t x = it->second.bin->x; + const uint32_t y = it->second.bin->y; + PremultipliedImage blank { Size { w, h } }; + PremultipliedImage::copy(blank, atlasImage, { 0, 0 }, { x, y }, { w, h }); + shelfPack.unref(*it->second.bin); patterns.erase(it); } -- cgit v1.2.1