diff options
Diffstat (limited to 'dm')
| -rw-r--r-- | dm/DM.cpp | 5 | ||||
| -rw-r--r-- | dm/DMWriteTask.cpp | 8 |
2 files changed, 6 insertions, 7 deletions
@@ -128,8 +128,7 @@ static void find_skps(SkTArray<SkString>* skps) { SkString filename; while (it.next(&filename)) { if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, filename.c_str())) { - skps->push_back( - SkOSPath::SkPathJoin(FLAGS_skps[0], filename.c_str())); + skps->push_back(SkOSPath::Join(FLAGS_skps[0], filename.c_str())); } } } @@ -148,7 +147,7 @@ static void kick_off_skps(const SkTArray<SkString>& skps, exit(1); } - SkString filename = SkOSPath::SkBasename(skps[i].c_str()); + SkString filename = SkOSPath::Basename(skps[i].c_str()); tasks->add(SkNEW_ARGS(DM::SKPTask, (reporter, tasks, pic, filename))); tasks->add(SkNEW_ARGS(DM::PDFTask, (reporter, tasks, pic, filename, RASTERIZE_PDF_PROC))); diff --git a/dm/DMWriteTask.cpp b/dm/DMWriteTask.cpp index b90e44a2aa..5435087535 100644 --- a/dm/DMWriteTask.cpp +++ b/dm/DMWriteTask.cpp @@ -136,11 +136,11 @@ void WriteTask::draw() { #endif this->makeDirOrFail(dir); for (int i = 0; i < fSuffixes.count(); i++) { - dir = SkOSPath::SkPathJoin(dir.c_str(), fSuffixes[i].c_str()); + dir = SkOSPath::Join(dir.c_str(), fSuffixes[i].c_str()); this->makeDirOrFail(dir); } - SkString path = SkOSPath::SkPathJoin(dir.c_str(), fGmName.c_str()); + SkString path = SkOSPath::Join(dir.c_str(), fGmName.c_str()); path.append(fExtension); const bool ok = fData.get() ? save_data_to_file(fData, path.c_str()) @@ -173,13 +173,13 @@ static SkString path_to_expected_image(const char* root, const Task& task) { SkASSERT(1 == suffixes.count()); // We'll look in root/suffix for images. - const SkString dir = SkOSPath::SkPathJoin(root, suffixes[0].c_str()); + const SkString dir = SkOSPath::Join(root, suffixes[0].c_str()); // Remove the suffix and tack on a .png. filename.remove(filename.size() - suffixLength, suffixLength); filename.append(".png"); - return SkOSPath::SkPathJoin(dir.c_str(), filename.c_str()); + return SkOSPath::Join(dir.c_str(), filename.c_str()); } bool WriteTask::Expectations::check(const Task& task, SkBitmap bitmap) const { |