sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix directory assertion logic

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-11 18:24:22 -08:00
parent b14d525968
commit 78442547f8
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/unit/imaging/image_io_test.cpp
View file

@ -20,8 +20,8 @@
#include <boost/filesystem/convenience.hpp>
#pragma GCC diagnostic pop
inline bool make_directory(std::string const& dir) {
return boost::filesystem::create_directory(dir);
inline void make_directory(std::string const& dir) {
boost::filesystem::create_directory(dir);
}
TEST_CASE("image io") {
@ -152,14 +152,16 @@ SECTION("image_util : save_to_file/save_to_stream/save_to_string")
supported_types.push_back(std::make_tuple("webp","webp"));
#endif
REQUIRE(make_directory("/tmp/mapnik-tests/"));
std::string directory_name("/tmp/mapnik-tests/");
make_directory(directory_name);
REQUIRE(mapnik::util::exists(directory_name));
for (auto const& info : supported_types)
{
std::string extension;
std::string format;
std::tie(extension, format) = info;
std::string filename = (boost::format("/tmp/mapnik-tests/mapnik-%1%.%2%") % named_color % extension).str();
std::string filename = (boost::format(directory_name + "mapnik-%1%.%2%") % named_color % extension).str();
mapnik::save_to_file(im, filename);
std::string str = mapnik::save_to_string(im, format);
std::ostringstream ss;