diff options
| author | Jonathan Wright <jonathan.wright@arm.com> | 2020-07-16 13:02:47 +0100 |
|---|---|---|
| committer | Jonathan Wright <jonathan.wright@arm.com> | 2020-07-23 19:16:52 +0100 |
| commit | 0241a1304fd183ee24fbdfe6891f18fdedea38f9 (patch) | |
| tree | d310d7e74f3f66d42108f708557e81e8959da885 /gtest/jpegtran-gtest-wrapper.cpp | |
| parent | ab7cd970a83609f98e8542cea8b81e8d92ddab83 (diff) | |
Fix file path manipulation on Windows
File path manipulation code introduced in previous commits only
supported char_t[]-based POSIX pathnames. This commit adds support
for wchar_t[]-based Windows pathnames.
Bug: 993876
Change-Id: Ie51eb0a18063ad3209779d9a799309e7a7cd729e
Diffstat (limited to 'gtest/jpegtran-gtest-wrapper.cpp')
| -rw-r--r-- | gtest/jpegtran-gtest-wrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtest/jpegtran-gtest-wrapper.cpp b/gtest/jpegtran-gtest-wrapper.cpp index e672d44..a6a1bd8 100644 --- a/gtest/jpegtran-gtest-wrapper.cpp +++ b/gtest/jpegtran-gtest-wrapper.cpp @@ -34,7 +34,7 @@ TEST(JPEGTranTest, ICC) { GetTestFilePath(&input_image_path, "testout_rgb_islow.jpg"); base::FilePath icc_path; GetTestFilePath(&icc_path, "test2.icc"); - base::FilePath output_path(FILE_PATH_LITERAL(GetTargetDirectory())); + base::FilePath output_path(GetTargetDirectory()); output_path = output_path.AppendASCII("testout_rgb_islow2.jpg"); std::string prog_name = "jpegtran"; @@ -62,7 +62,7 @@ TEST(JPEGTranTest, Crop) { base::FilePath input_image_path; GetTestFilePath(&input_image_path, "testorig.jpg"); - base::FilePath output_path(FILE_PATH_LITERAL(GetTargetDirectory())); + base::FilePath output_path(GetTargetDirectory()); output_path = output_path.AppendASCII("testout_crop.jpg"); std::string prog_name = "jpegtran"; @@ -91,7 +91,7 @@ TEST(JPEGTranTest, ISlow420Ari) { base::FilePath input_image_path; GetTestFilePath(&input_image_path, "testimgint.jpg"); - base::FilePath output_path(FILE_PATH_LITERAL(GetTargetDirectory())); + base::FilePath output_path(GetTargetDirectory()); output_path = output_path.AppendASCII("testout_420_islow_ari2.jpg"); std::string prog_name = "jpegtran"; @@ -115,7 +115,7 @@ TEST(JPEGTranTest, ISlow420) { base::FilePath input_image_path; GetTestFilePath(&input_image_path, "testimgari.jpg"); - base::FilePath output_path(FILE_PATH_LITERAL(GetTargetDirectory())); + base::FilePath output_path(GetTargetDirectory()); output_path = output_path.AppendASCII("testout_420_islow.jpg"); std::string prog_name = "jpegtran"; |