summaryrefslogtreecommitdiff
path: root/platform/default/image.cpp
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2014-12-03 22:02:55 +1100
committerLeith Bade <leith@mapbox.com>2014-12-03 22:02:55 +1100
commit94d34ce7ac7182a1ff7cc0dea675abcdd7592b56 (patch)
treee5f23d9ec5ff189873928ee6ef9e2d5ea3f7dee0 /platform/default/image.cpp
parentf090d6b2642a4b28f9690c4724a2f702d82f4072 (diff)
parent82f3574d09064a442e30eb2dc7639f473749c5bd (diff)
downloadqtlocation-mapboxgl-94d34ce7ac7182a1ff7cc0dea675abcdd7592b56.tar.gz
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts: src/map/map.cpp
Diffstat (limited to 'platform/default/image.cpp')
-rw-r--r--platform/default/image.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/default/image.cpp b/platform/default/image.cpp
index 8c794fc31f..311aa2ed72 100644
--- a/platform/default/image.cpp
+++ b/platform/default/image.cpp
@@ -1,6 +1,7 @@
#include <mbgl/util/image.hpp>
#include <mbgl/platform/log.hpp>
#include <mbgl/util/string.hpp>
+#include <mbgl/util/std.hpp>
#include <png.h>
@@ -81,7 +82,7 @@ Image::Image(std::string const& data)
auto reader = getImageReader(data.c_str(), data.size());
width = reader->width();
height = reader->height();
- img = ::std::unique_ptr<char[]>(new char[width * height * 4]());
+ img = util::make_unique<char[]>(width * height * 4);
reader->read(0, 0, width, height, img.get());
}
catch (ImageReaderException const& ex)