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

Handle unicode file path on windows

Browse source
This commit is contained in:
Mathieu Champlon 2018-01-20 21:45:30 +01:00
parent c6b9036002
commit 22d0cb72fd
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
utils/shapeindex/shapeindex.cpp
View file

@ -40,7 +40,12 @@
const int DEFAULT_DEPTH = 8; const int DEFAULT_DEPTH = 8;
const double DEFAULT_RATIO = 0.55; const double DEFAULT_RATIO = 0.55;
#ifdef _WINDOWS
#include <windows.h>
int main ()
#else
int main (int argc,char** argv) int main (int argc,char** argv)
#endif
{ {
using namespace mapnik; using namespace mapnik;
namespace po = boost::program_options; namespace po = boost::program_options;
@ -67,7 +72,15 @@ int main (int argc,char** argv)
po::positional_options_description p; po::positional_options_description p;
p.add("shape_files",-1); p.add("shape_files",-1);
po::variables_map vm; po::variables_map vm;
#ifdef _WINDOWS
std::vector<std::string> args;
const auto wargs = po::split_winmain(GetCommandLineW());
for( auto it = wargs.begin() + 1; it != wargs.end(); ++it )
args.push_back(mapnik::utf16_to_utf8(*it));
po::store(po::command_line_parser(args).options(desc).positional(p).run(), vm);
#else
po::store(po::command_line_parser(argc, argv).options(desc).positional(p).run(), vm); po::store(po::command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
#endif
po::notify(vm); po::notify(vm);
if (vm.count("version")) if (vm.count("version"))
@ -278,7 +291,11 @@ int main (int argc,char** argv)
if (count > 0) if (count > 0)
{ {
std::clog << " number shapes=" << count << std::endl; std::clog << " number shapes=" << count << std::endl;
#ifdef _WINDOWS
std::ofstream file(mapnik::utf8_to_utf16(shapename+".index").c_str(), std::ios::trunc | std::ios::binary);
#else
std::ofstream file((shapename+".index").c_str(), std::ios::trunc | std::ios::binary); std::ofstream file((shapename+".index").c_str(), std::ios::trunc | std::ios::binary);
#endif
if (!file) if (!file)
{ {
std::clog << "cannot open index file for writing file \"" std::clog << "cannot open index file for writing file \""