diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-29 19:58:34 -0400 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 12:02:28 -0400 |
commit | e3bc69b7e77aa6771c8db3695f12548447e1de51 (patch) | |
tree | 0c1a0bde928fea3e09b1d72222b400176c0936c7 /include | |
parent | 7a13db9a863c9be58709e941f44eb2c370276e2a (diff) | |
download | qtlocation-mapboxgl-e3bc69b7e77aa6771c8db3695f12548447e1de51.tar.gz |
use CoreImage for decoding/encoding images on osx/ios
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/platform/default/headless_view.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/util/image.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/mbgl/platform/default/headless_view.hpp b/include/mbgl/platform/default/headless_view.hpp index c0baddb884..f140338349 100644 --- a/include/mbgl/platform/default/headless_view.hpp +++ b/include/mbgl/platform/default/headless_view.hpp @@ -27,7 +27,7 @@ public: void createContext(); void resize(uint16_t width, uint16_t height, float pixelRatio); - const std::unique_ptr<uint32_t[]> readPixels(); + std::unique_ptr<uint32_t[]> readPixels(); void notify(); void notify_map_change(MapChange change, timestamp delay = 0); diff --git a/include/mbgl/util/image.hpp b/include/mbgl/util/image.hpp index cb7db6d6fc..b2f70e1442 100644 --- a/include/mbgl/util/image.hpp +++ b/include/mbgl/util/image.hpp @@ -7,12 +7,12 @@ namespace mbgl { namespace util { -std::string compress_png(int width, int height, void *rgba, bool flip = false); +std::string compress_png(int width, int height, void *rgba); class Image { public: - Image(const std::string &img, bool flip = false); + Image(const std::string &img); inline const char *getData() const { return img.get(); } inline uint32_t getWidth() const { return width; } |