Fix issue 429: output filenames interperted as latin1 instead of utf8

Teabeats · Oct 3, 2011 · b92de59 · b92de59
1 parent 870b16a
commit b92de59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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]);
 }