tools/filtermain.cpp - Issue 327403002: Cleanup: Delete sk_tools::make_filepath() in favor of SkOSPath::SkPathJoin().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/filtermain.cpp

Issue 327403002: Cleanup: Delete sk_tools::make_filepath() in favor of SkOSPath::SkPathJoin(). (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fixes Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: tools/filtermain.cpp

diff --git a/tools/filtermain.cpp b/tools/filtermain.cpp

index 36b9f925c59bf365706bac64b5d037d7c3ba9692..a67f744983624ab790ceb40350f0ed3543fdd0f2 100644

--- a/tools/filtermain.cpp

+++ b/tools/filtermain.cpp

@@ -818,9 +818,9 @@ int tool_main(int argc, char** argv) {

if (iter.next(&inputFilename)) {

do {

- sk_tools::make_filepath(&inFile, inDir, inputFilename);

+ inFile = SkOSPath::SkPathJoin(inDir.c_str(), inputFilename.c_str());

if (!outDir.isEmpty()) {

- sk_tools::make_filepath(&outFile, outDir, inputFilename);

+ outFile = SkOSPath::SkPathJoin(outDir.c_str(), inputFilename.c_str());

}

SkDebugf("Executing %s\n", inputFilename.c_str());

filter_picture(inFile, outFile);

« no previous file with comments | « tools/bench_pictures_main.cpp ('k') | tools/lua/lua_pictures.cpp » ('j') | no next file with comments »