mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-09 14:55:08 -06:00
Unicode handling:
Removed the Perl dependencies on Encode, Encode::Locale and Unicode::Normalize. Added dependency on boost::locale. Added encode_path, decode_path, normalize_utf8 functions to Slic3r.xs Slic3r.xs has been made mostly utf8 safe by using the boost::nowide library, thanks to @alexrj for the idea. Simplified the encode_path / decode_path stuff: wxWidgets are unicode already, so there is no need to decode_path() from it. Perl / win32 interfacing is non-unicode, so decode_path() is executed on ARGV just at the beginning of the perl scripts.
This commit is contained in:
parent
31085fb1d7
commit
1385018724
33 changed files with 236 additions and 186 deletions
|
@ -14,6 +14,9 @@ use Getopt::Long qw(:config no_auto_abbrev);
|
|||
use Slic3r;
|
||||
$|++;
|
||||
|
||||
# Convert all parameters from the local code page to utf8 on Windows.
|
||||
@ARGV = map Slic3r::decode_path($_), @ARGV if $^O eq 'MSWin32';
|
||||
|
||||
my %opt = ();
|
||||
{
|
||||
my %options = (
|
||||
|
@ -25,12 +28,12 @@ my %opt = ();
|
|||
}
|
||||
|
||||
{
|
||||
my $model = Slic3r::Model->load_amf(Slic3r::encode_path($ARGV[0]));
|
||||
my $model = Slic3r::Model->load_amf($ARGV[0]);
|
||||
my $output_file = $ARGV[0];
|
||||
$output_file =~ s/\.[aA][mM][fF](?:\.[xX][mM][lL])?$/\.stl/;
|
||||
|
||||
printf "Writing to %s\n", basename($output_file);
|
||||
$model->store_stl(Slic3r::encode_path($output_file), binary => !$opt{ascii});
|
||||
$model->store_stl($output_file, binary => !$opt{ascii});
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue