Index: tools/render_pdfs_main.cpp |
diff --git a/tools/render_pdfs_main.cpp b/tools/render_pdfs_main.cpp |
index fd078d3901643222f2c8baf3a3eb7c4562ed7daa..5e337009c6c9a3af5c8725303286ffb2cacd1c8a 100644 |
--- a/tools/render_pdfs_main.cpp |
+++ b/tools/render_pdfs_main.cpp |
@@ -111,7 +111,7 @@ static SkData* encode_to_dct_data(size_t*, const SkBitmap& bitmap) { |
*/ |
static bool make_output_filepath(SkString* path, const SkString& dir, |
const SkString& name) { |
- sk_tools::make_filepath(path, dir, name); |
+ *path = SkOSPath::SkPathJoin(dir.c_str(), name.c_str()); |
return replace_filename_extension(path, |
SKP_FILE_EXTENSION, |
PDF_FILE_EXTENSION); |
@@ -197,8 +197,7 @@ static int process_input(const SkString& input, const SkString& outputDir, |
SkOSFile::Iter iter(input.c_str(), SKP_FILE_EXTENSION); |
SkString inputFilename; |
while (iter.next(&inputFilename)) { |
- SkString inputPath; |
- sk_tools::make_filepath(&inputPath, input, inputFilename); |
+ SkString inputPath = SkOSPath::SkPathJoin(input.c_str(), inputFilename.c_str()); |
if (!render_pdf(inputPath, outputDir, renderer)) { |
++failures; |
} |