From b92de5910fd977585e2a95312a7b6e0daba6da9f Mon Sep 17 00:00:00 2001 From: Antialize Date: Mon, 3 Oct 2011 20:57:36 +0200 Subject: [PATCH] Fix issue 429: output filenames interperted as latin1 instead of utf8 --- src/image/imagecommandlineparser.cc | 4 ++-- src/pdf/pdfcommandlineparser.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/image/imagecommandlineparser.cc b/src/image/imagecommandlineparser.cc index eae5e4218..b1cd03ca6 100644 --- a/src/image/imagecommandlineparser.cc +++ b/src/image/imagecommandlineparser.cc @@ -115,9 +115,9 @@ void ImageCommandLineParser::parseArguments(int argc, const char ** argv, bool f bool defaultMode=false; for (int i=1; i < argc; ++i) { if (i==argc-2 && (argv[i][0] != '-' || argv[i][1] == '\0')) { // the arg before last (in) - settings.in = argv[i]; + settings.in = QString::fromUtf8(argv[i]); } else if (i==argc-1 && (argv[i][0] != '-' || argv[i][1] == '\0')) { // the last arg (out) - settings.out = argv[i]; + settings.out = QString::fromUtf8(argv[i]); } else { parseArg(global, argc, argv, defaultMode, i, 0); } diff --git a/src/pdf/pdfcommandlineparser.cc b/src/pdf/pdfcommandlineparser.cc index 311aab256..d910bfbf3 100644 --- a/src/pdf/pdfcommandlineparser.cc +++ b/src/pdf/pdfcommandlineparser.cc @@ -205,5 +205,5 @@ void PdfCommandLineParser::parseArguments(int argc, const char ** argv, bool fro usage(stderr, false); exit(1); } - globalSettings.out = argv[argc-1]; + globalSettings.out = QString::fromUtf8(argv[argc-1]); }