diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-25 13:49:12 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-25 15:57:37 -0800 |
commit | 1d33790dc06a1127e55753d123d55e6ec6e89713 (patch) | |
tree | 3db9915f722dada6375a273297647cc1b0c9df51 /test/api/annotations.cpp | |
parent | ed5eb9edc1458692bf6ff71d5ec95a7d3400318f (diff) | |
download | qtlocation-mapboxgl-1d33790dc06a1127e55753d123d55e6ec6e89713.tar.gz |
[core] Fix image type of Map::renderStill
It's a premultiplied image. This implies that we were misusing encodePNG
in most cases, as we were passing premultiplied pixels which were then
interpreted as unmultiplied. I changed encodePNG to accept premultipled
pixels, and unpremultiply in the implementations.
Diffstat (limited to 'test/api/annotations.cpp')
-rw-r--r-- | test/api/annotations.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index c4fea02079..ae9c804730 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -14,16 +14,16 @@ using namespace mbgl; -UnassociatedImage render(Map& map) { - std::promise<UnassociatedImage> promise; - map.renderStill([&](std::exception_ptr, UnassociatedImage&& image) { +PremultipliedImage render(Map& map) { + std::promise<PremultipliedImage> promise; + map.renderStill([&](std::exception_ptr, PremultipliedImage&& image) { promise.set_value(std::move(image)); }); return std::move(promise.get_future().get()); } void checkRendering(Map& map, const char * name) { - UnassociatedImage actual = render(map); + PremultipliedImage actual = render(map); test::checkImage(std::string("test/fixtures/annotations/") + name + "/", actual, 0.0002, 0.1); } |