From 9cd9065031f7d2af62e437f2b32b44207484baca Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 20 Jan 2016 00:07:04 +0200 Subject: Revert "Revert WebP support due to broken builds" This reverts commit 6709bdcacd5a45a10b554f3f225206c9494e5e43. There was an issue with the script that removes '-lwebp' from WebP linker flags, since we're statically linking. This is now fixed. --- include/mbgl/util/image.hpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/mbgl/util/image.hpp') diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index fde42c7c5e..7927b777ea 100644 --- a/include/mbgl/util/image.hpp +++ b/include/mbgl/util/image.hpp @@ -21,6 +21,11 @@ public: height(h), data(std::make_unique(size())) {} + Image(size_t w, size_t h, std::unique_ptr data_) + : width(w), + height(h), + data(std::move(data_)) {} + size_t stride() const { return width * 4; } size_t size() const { return width * height * 4; } -- cgit v1.2.1