diff options
| author | artemp <artem@mapnik.org> | 2014-11-07 11:50:33 +0000 |
|---|---|---|
| committer | artemp <artem@mapnik.org> | 2014-11-07 11:50:33 +0000 |
| commit | 52a7629b350b59ee46e7d7aead63b1a4cda3714c (patch) | |
| tree | a275999c9159c5c940cf2e4d284328079d2e3092 /platform | |
| parent | f42d39dc6eca3154cf0de9252ac70b465022410e (diff) | |
| parent | fb7f23884bedb0a2a825baa8dc14d6b84384a0e3 (diff) | |
| download | qtlocation-mapboxgl-52a7629b350b59ee46e7d7aead63b1a4cda3714c.tar.gz | |
Merge branch 'master' into image-readers
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/darwin/image.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/darwin/image.mm b/platform/darwin/image.mm index 50c871533d..b8df3c403e 100644 --- a/platform/darwin/image.mm +++ b/platform/darwin/image.mm @@ -93,8 +93,8 @@ Image::Image(const std::string &source_data) { return; } - width = CGImageGetWidth(image); - height = CGImageGetHeight(image); + width = uint32_t(CGImageGetWidth(image)); + height = uint32_t(CGImageGetHeight(image)); CGRect rect = {{ 0, 0 }, { static_cast<CGFloat>(width), static_cast<CGFloat>(height) }}; img = ::std::unique_ptr<char[]>(new char[width * height * 4]()); |