GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-07-19 22:44:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More fixes for non-ASCII paths on Windows

Browse Source
This commit is contained in:
Alessandro Ranellucci 2016-08-28 11:41:00 +02:00
parent 66e48e9d22
commit ade661ebf1
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Slic3r/Config.pm
View File

@ -89,10 +89,17 @@ sub load {
# legacy syntax of load() # legacy syntax of load()
my $config = $class->new; my $config = $class->new;
$config->_load($file); $config->_load(Slic3r::encode_path($file));
return $config; return $config;
} }
sub save {
my $self = shift;
my ($file) = @_;
return $self->_save(Slic3r::encode_path($file));
}
sub load_ini_hash { sub load_ini_hash {
my $class = shift; my $class = shift;
my ($ini_hash) = @_; my ($ini_hash) = @_;

4
xs/xsp/Config.xsp
View File

@ -39,7 +39,7 @@
%name{setenv} void setenv_(); %name{setenv} void setenv_();
double min_object_distance(); double min_object_distance();
%name{_load} void load(std::string file); %name{_load} void load(std::string file);
void save(std::string file); %name{_save} void save(std::string file);
}; };
%name{Slic3r::Config::Static} class StaticPrintConfig { %name{Slic3r::Config::Static} class StaticPrintConfig {
@ -87,7 +87,7 @@
%name{setenv} void setenv_(); %name{setenv} void setenv_();
double min_object_distance(); double min_object_distance();
%name{_load} void load(std::string file); %name{_load} void load(std::string file);
void save(std::string file); %name{_save} void save(std::string file);
}; };
%package{Slic3r::Config}; %package{Slic3r::Config};

2
xs/xsp/my.map
View File

@ -254,7 +254,7 @@ INPUT
T_STD_STRING T_STD_STRING
{ {
size_t len; size_t len;
const char * c = SvPVutf8($arg, len); const char * c = SvPV($arg, len);
$var = std::string(c, len); $var = std::string(c, len);
} }