tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

return unique_ptr from get_image_reader

Browse Source
This commit is contained in:
artemp
2014-11-19 16:31:16 +01:00
parent f7e813238d
commit 04cea00d5d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/default/image_reader.cpp
View File

@@ -1,3 +1,4 @@
#include "mbgl/util/std.hpp"
#include "mbgl/util/image_reader.hpp"
#include "mbgl/util/png_reader.hpp"
#include "mbgl/util/jpeg_reader.hpp"
@@ -42,18 +43,18 @@ inline boost::optional<std::string> type_from_bytes(char const* data, size_t siz
return result_type();
}
image_reader* get_image_reader(char const* data, size_t size)
std::unique_ptr<image_reader> get_image_reader(char const* data, size_t size)
{
boost::optional<std::string> type = type_from_bytes(data,size);
if (type)
{
if (*type == "png")
{
return new png_reader<boost::iostreams::array_source>(data, size);
return std::make_unique<png_reader<boost::iostreams::array_source>>(data, size);
}
else if (*type == "jpeg")
{
return new jpeg_reader<boost::iostreams::array_source>(data, size);
return std::make_unique<jpeg_reader<boost::iostreams::array_source>>(data, size);
}
}
throw image_reader_exception("image_reader: can't determine type from input data");