Revert WebP support due to broken builds

This reverts commits 2010fbb0e61cbe7c0b08560118ca887fc1d7193e, a361ce47a19d37b96b48cd605c62c5ab79bba462, and d004bb275ae3ea60bb6c2febd6fa22f1f51c3993.

10 files changed, 3 insertions, 76 deletions

diff --git a/configure b/configure
index 180d03516e..d8ccc0b19e 100755
--- a/configure
+++ b/configure
@@ -105,7 +105,6 @@ print_flags variant static_libs cflags ldflags
 print_flags rapidjson static_libs cflags ldflags
 print_flags gtest static_libs cflags ldflags
 print_flags pixelmatch static_libs cflags ldflags
-print_flags webp static_libs cflags ldflags
 
 CONFIG+="  }
 }
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi
index d43915863a..22dc452f33 100644
--- a/gyp/platform-linux.gypi
+++ b/gyp/platform-linux.gypi
@@ -17,7 +17,6 @@
         '../platform/default/application_root.cpp',
         '../platform/default/thread.cpp',
         '../platform/default/image.cpp',
-        '../platform/default/webp_reader.cpp',
         '../platform/default/png_reader.cpp',
         '../platform/default/jpeg_reader.cpp',
         '../platform/default/timer.cpp',
@@ -36,7 +35,6 @@
           '<@(nunicode_cflags)',
           '<@(boost_cflags)',
           '<@(sqlite_cflags)',
-          '<@(webp_cflags)',
         ],
         'ldflags': [
           '<@(libpng_ldflags)',
@@ -45,7 +43,6 @@
           '<@(nunicode_ldflags)',
           '<@(sqlite_ldflags)',
           '<@(zlib_ldflags)',
-          '<@(webp_ldflags)',
         ],
         'libraries': [
           '<@(libpng_static_libs)',
@@ -54,7 +51,6 @@
           '<@(nunicode_static_libs)',
           '<@(sqlite_static_libs)',
           '<@(zlib_static_libs)',
-          '<@(webp_static_libs)',
         ],
       },
 
diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp
index 7927b777ea..fde42c7c5e 100644
--- a/include/mbgl/util/image.hpp
+++ b/include/mbgl/util/image.hpp
@@ -21,11 +21,6 @@ public:
           height(h),
           data(std::make_unique<uint8_t[]>(size())) {}
 
-    Image(size_t w, size_t h, std::unique_ptr<uint8_t[]> data_)
-        : width(w),
-          height(h),
-          data(std::move(data_)) {}
-
     size_t stride() const { return width * 4; }
     size_t size() const { return width * height * 4; }
 
diff --git a/platform/default/image.cpp b/platform/default/image.cpp
index 71fb5414b3..bf8071af5c 100644
--- a/platform/default/image.cpp
+++ b/platform/default/image.cpp
@@ -70,10 +70,6 @@ std::string encodePNG(const PremultipliedImage& pre) {
     return result;
 }
 
-#if !defined(__ANDROID__) && !defined(__APPLE__)
-PremultipliedImage decodeWebP(const uint8_t*, size_t);
-#endif // !defined(__ANDROID__) && !defined(__APPLE__)
-
 PremultipliedImage decodePNG(const uint8_t*, size_t);
 PremultipliedImage decodeJPEG(const uint8_t*, size_t);
 
@@ -81,26 +77,16 @@ PremultipliedImage decodeImage(const std::string& string) {
     const uint8_t* data = reinterpret_cast<const uint8_t*>(string.data());
     const size_t size = string.size();
 
-#if !defined(__ANDROID__) && !defined(__APPLE__)
-    if (size >= 12) {
-        uint32_t riff_magic = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
-        uint32_t webp_magic = (data[8] << 24) | (data[9] << 16) | (data[10] << 8) | data[11];
-        if (riff_magic == 0x52494646 && webp_magic == 0x57454250) {
-            return decodeWebP(data, size);
-        }
-    }
-#endif // !defined(__ANDROID__) && !defined(__APPLE__)
-
     if (size >= 4) {
-        uint32_t magic = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
+        unsigned int magic = (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3];
         if (magic == 0x89504E47U) {
             return decodePNG(data, size);
         }
     }
 
     if (size >= 2) {
-        uint16_t magic = ((data[0] << 8) | data[1]) & 0xffff;
-        if (magic == 0xFFD8) {
+        unsigned int magic = ((data[0] << 8) | data[1]) & 0xffff;
+        if (magic == 0xffd8) {
             return decodeJPEG(data, size);
         }
     }
diff --git a/platform/default/webp_reader.cpp b/platform/default/webp_reader.cpp
deleted file mode 100644
index 37d23da110..0000000000
--- a/platform/default/webp_reader.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <mbgl/util/image.hpp>
-#include <mbgl/util/premultiply.hpp>
-#include <mbgl/platform/log.hpp>
-
-extern "C"
-{
-#include <webp/decode.h>
-}
-
-namespace mbgl {
-
-PremultipliedImage decodeWebP(const uint8_t* data, size_t size) {
-    int width = 0, height = 0;
-    if (WebPGetInfo(data, size, &width, &height) == 0) {
-        throw std::runtime_error("failed to retrieve WebP basic header information");
-    }
-
-    std::unique_ptr<uint8_t[]> webp(WebPDecodeRGBA(data, size, &width, &height));
-    if (!webp) {
-        throw std::runtime_error("failed to decode WebP data");
-    }
-
-    UnassociatedImage image { size_t(width), size_t(height), std::move(webp) };
-    return util::premultiply(std::move(image));
-}
-
-} // namespace mbgl
diff --git a/platform/linux/scripts/configure.sh b/platform/linux/scripts/configure.sh
index 8510d83bdc..e824376804 100644
--- a/platform/linux/scripts/configure.sh
+++ b/platform/linux/scripts/configure.sh
@@ -15,7 +15,6 @@ VARIANT_VERSION=1.0
 RAPIDJSON_VERSION=1.0.2
 GTEST_VERSION=1.7.0
 PIXELMATCH_VERSION=0.9.0
-WEBP_VERSION=0.5.0
 
 function print_opengl_flags {
     CONFIG+="    'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN
diff --git a/src/mbgl/util/mapbox.cpp b/src/mbgl/util/mapbox.cpp
index d94a9a5f7d..067c9918cc 100644
--- a/src/mbgl/util/mapbox.cpp
+++ b/src/mbgl/util/mapbox.cpp
@@ -129,12 +129,6 @@ std::string normalizeRasterTileURL(const std::string& url) {
     }
 
     std::string normalizedURL(url);
-#if !defined(__ANDROID__) && !defined(__APPLE__)
-    // Replace PNG with WebP.
-    if (normalizedURL.compare(extensionIdx + 1, 3, "png") == 0) {
-        normalizedURL.replace(extensionIdx + 1, 3, "webp");
-    }
-#endif // !defined(__ANDROID__) && !defined(__APPLE__)
     normalizedURL.insert(extensionIdx, "{ratio}");
     return normalizedURL;
 }
diff --git a/test/fixtures/image/tile.webp b/test/fixtures/image/tile.webp
deleted file mode 100644
index 5dbad8f88d..0000000000
--- a/test/fixtures/image/tile.webp
+++ /dev/null
diff --git a/test/miscellaneous/image.cpp b/test/miscellaneous/image.cpp
index 9886eede45..2db62b96d3 100644
--- a/test/miscellaneous/image.cpp
+++ b/test/miscellaneous/image.cpp
@@ -78,14 +78,6 @@ TEST(Image, JPEGTile) {
     EXPECT_EQ(256, image.height);
 }
 
-#if !defined(__ANDROID__) && !defined(__APPLE__)
-TEST(Image, WebPTile) {
-    PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/tile.webp"));
-    EXPECT_EQ(256, image.width);
-    EXPECT_EQ(256, image.height);
-}
-#endif // !defined(__ANDROID__) && !defined(__APPLE__)
-
 TEST(Image, Premultiply) {
     UnassociatedImage rgba { 1, 1 };
     rgba.data[0] = 255;
diff --git a/test/miscellaneous/mapbox.cpp b/test/miscellaneous/mapbox.cpp
index d6f9948e66..02a08db9ee 100644
--- a/test/miscellaneous/mapbox.cpp
+++ b/test/miscellaneous/mapbox.cpp
@@ -37,17 +37,10 @@ TEST(Mapbox, SpriteURL) {
 
 TEST(Mapbox, TileURL) {
     try {
-#if defined(__ANDROID__) || defined(__APPLE__)
         EXPECT_EQ("http://path.png/tile{ratio}.png", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png"));
         EXPECT_EQ("http://path.png/tile{ratio}.png32", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png32"));
         EXPECT_EQ("http://path.png/tile{ratio}.png70", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png70"));
         EXPECT_EQ("http://path.png/tile{ratio}.png?access_token=foo", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png?access_token=foo"));
-#else
-        EXPECT_EQ("http://path.png/tile{ratio}.webp", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png"));
-        EXPECT_EQ("http://path.png/tile{ratio}.webp32", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png32"));
-        EXPECT_EQ("http://path.png/tile{ratio}.webp70", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png70"));
-        EXPECT_EQ("http://path.png/tile{ratio}.webp?access_token=foo", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.png?access_token=foo"));
-#endif // defined(__ANDROID__) || defined(__APPLE__)
         EXPECT_EQ("http://path.png/tile{ratio}.pbf", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.pbf"));
         EXPECT_EQ("http://path.png/tile{ratio}.pbf?access_token=foo", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.pbf?access_token=foo"));
         EXPECT_EQ("http://path.png/tile{ratio}.pbf?access_token=foo.png", mbgl::util::mapbox::normalizeRasterTileURL("http://path.png/tile.pbf?access_token=foo.png"));