diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 13:32:22 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 13:34:56 -0800 |
| commit | 6709bdcacd5a45a10b554f3f225206c9494e5e43 (patch) | |
| tree | 0117df5dcf6eadad1d6b6c5208b41a782e46258b /test | |
| parent | 2010fbb0e61cbe7c0b08560118ca887fc1d7193e (diff) | |
| download | qtlocation-mapboxgl-6709bdcacd5a45a10b554f3f225206c9494e5e43.tar.gz | |
Revert WebP support due to broken builds
This reverts commits 2010fbb0e61cbe7c0b08560118ca887fc1d7193e, a361ce47a19d37b96b48cd605c62c5ab79bba462, and d004bb275ae3ea60bb6c2febd6fa22f1f51c3993.
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/image/tile.webp | bin | 8916 -> 0 bytes | |||
| -rw-r--r-- | test/miscellaneous/image.cpp | 8 | ||||
| -rw-r--r-- | test/miscellaneous/mapbox.cpp | 7 |
3 files changed, 0 insertions, 15 deletions
diff --git a/test/fixtures/image/tile.webp b/test/fixtures/image/tile.webp Binary files differdeleted 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")); |
