diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-02-17 15:53:14 +0100 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-22 11:56:01 -0700 |
commit | 1dd81d9776baf9b9ef61b05d29f7acbb0f2a1508 (patch) | |
tree | ded904ed0a8b2d9cb0f3f784d683162e5917e99f /test/fixtures | |
parent | c608803ca95e833c9312c0f1cd622594224d5458 (diff) | |
download | qtlocation-mapboxgl-1dd81d9776baf9b9ef61b05d29f7acbb0f2a1508.tar.gz |
[test] remove crc64 and compare images
boost's crc64 breaks on iOS
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/annotations/result-spriteatlas-empty.png | bin | 0 -> 110 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteatlas-updated.png | bin | 0 -> 135 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteatlas.png | bin | 0 -> 1124 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteatlassize.png | bin | 0 -> 1118 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png | bin | 0 -> 838 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png | bin | 0 -> 918 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteimagecreation1x-blank.png | bin | 0 -> 91 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteimagecreation1x-museum.png | bin | 0 -> 647 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteimagecreation2x.png | bin | 0 -> 918 bytes | |||
-rw-r--r-- | test/fixtures/annotations/result-spriteparsing.png | bin | 0 -> 730 bytes | |||
-rw-r--r-- | test/fixtures/util.cpp | 21 | ||||
-rw-r--r-- | test/fixtures/util.hpp | 4 |
12 files changed, 0 insertions, 25 deletions
diff --git a/test/fixtures/annotations/result-spriteatlas-empty.png b/test/fixtures/annotations/result-spriteatlas-empty.png Binary files differnew file mode 100644 index 0000000000..effcd38f1e --- /dev/null +++ b/test/fixtures/annotations/result-spriteatlas-empty.png diff --git a/test/fixtures/annotations/result-spriteatlas-updated.png b/test/fixtures/annotations/result-spriteatlas-updated.png Binary files differnew file mode 100644 index 0000000000..3c850c0a25 --- /dev/null +++ b/test/fixtures/annotations/result-spriteatlas-updated.png diff --git a/test/fixtures/annotations/result-spriteatlas.png b/test/fixtures/annotations/result-spriteatlas.png Binary files differnew file mode 100644 index 0000000000..e886e060fe --- /dev/null +++ b/test/fixtures/annotations/result-spriteatlas.png diff --git a/test/fixtures/annotations/result-spriteatlassize.png b/test/fixtures/annotations/result-spriteatlassize.png Binary files differnew file mode 100644 index 0000000000..d9ae7dab47 --- /dev/null +++ b/test/fixtures/annotations/result-spriteatlassize.png diff --git a/test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png b/test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png Binary files differnew file mode 100644 index 0000000000..529b3fe2b4 --- /dev/null +++ b/test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png diff --git a/test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png b/test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png Binary files differnew file mode 100644 index 0000000000..96cebabc95 --- /dev/null +++ b/test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png diff --git a/test/fixtures/annotations/result-spriteimagecreation1x-blank.png b/test/fixtures/annotations/result-spriteimagecreation1x-blank.png Binary files differnew file mode 100644 index 0000000000..7613586672 --- /dev/null +++ b/test/fixtures/annotations/result-spriteimagecreation1x-blank.png diff --git a/test/fixtures/annotations/result-spriteimagecreation1x-museum.png b/test/fixtures/annotations/result-spriteimagecreation1x-museum.png Binary files differnew file mode 100644 index 0000000000..3f45c7de2b --- /dev/null +++ b/test/fixtures/annotations/result-spriteimagecreation1x-museum.png diff --git a/test/fixtures/annotations/result-spriteimagecreation2x.png b/test/fixtures/annotations/result-spriteimagecreation2x.png Binary files differnew file mode 100644 index 0000000000..96cebabc95 --- /dev/null +++ b/test/fixtures/annotations/result-spriteimagecreation2x.png diff --git a/test/fixtures/annotations/result-spriteparsing.png b/test/fixtures/annotations/result-spriteparsing.png Binary files differnew file mode 100644 index 0000000000..ba5840cdf7 --- /dev/null +++ b/test/fixtures/annotations/result-spriteparsing.png diff --git a/test/fixtures/util.cpp b/test/fixtures/util.cpp index 5617b15e8b..0829fe72d8 100644 --- a/test/fixtures/util.cpp +++ b/test/fixtures/util.cpp @@ -8,11 +8,6 @@ #include <mapbox/pixelmatch.hpp> -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow" -#include <boost/crc.hpp> -#pragma GCC diagnostic pop - #include <csignal> #include <future> @@ -90,22 +85,6 @@ Server::~Server() { } } - -// from https://gist.github.com/ArtemGr/997887 -uint64_t crc64(const char* data, size_t size) { - boost::crc_optimal<64, 0x04C11DB7, 0, 0, false, false> crc; - crc.process_bytes(data, size); - return crc.checksum(); -} - -uint64_t crc64(const std::string& str) { - return crc64(str.data(), str.size()); -} - -uint64_t crc64(const PremultipliedImage &image) { - return crc64(reinterpret_cast<const char*>(image.data.get()), image.size()); -} - PremultipliedImage render(Map& map) { std::promise<PremultipliedImage> promise; map.renderStill([&](std::exception_ptr, PremultipliedImage&& image) { diff --git a/test/fixtures/util.hpp b/test/fixtures/util.hpp index 2e27e5bf0f..911f2073b5 100644 --- a/test/fixtures/util.hpp +++ b/test/fixtures/util.hpp @@ -31,10 +31,6 @@ private: int fd = -1; }; -uint64_t crc64(const char*, size_t); -uint64_t crc64(const std::string&); -uint64_t crc64(const PremultipliedImage&); - PremultipliedImage render(Map&); void checkImage(const std::string& base, |