Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts: README.md configure gyp/mbgl-linux.gypi include/mbgl/map/map.hpp include/mbgl/platform/default/image_reader.hpp include/mbgl/platform/default/jpeg_reader.hpp include/mbgl/platform/default/png_reader.hpp include/mbgl/util/uv_detail.hpp ios/mapbox-gl-cocoa platform/default/image.cpp platform/default/image_reader.cpp platform/default/jpeg_reader.cpp platform/default/png_reader.cpp src/map/map.cpp
This commit is contained in:
@@ -78,13 +78,13 @@ Image::Image(std::string const& data)
|
||||
{
|
||||
try
|
||||
{
|
||||
auto reader = get_image_reader(data.c_str(), data.size());
|
||||
auto reader = getImageReader(data.c_str(), data.size());
|
||||
width = reader->width();
|
||||
height = reader->height();
|
||||
img = ::std::unique_ptr<char[]>(new char[width * height * 4]());
|
||||
reader->read(0, 0, width, height, img.get());
|
||||
}
|
||||
catch (image_reader_exception const& ex)
|
||||
catch (ImageReaderException const& ex)
|
||||
{
|
||||
fprintf(stderr, "Image: %s\n", ex.what());
|
||||
img.reset();
|
||||
|
||||
Reference in New Issue
Block a user