tools/picture_utils.cpp - Issue 428443002: Cleanup: Rename SkOSPath functions.

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/picture_utils.cpp

Issue 428443002: Cleanup: Rename SkOSPath functions. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: fix Created 6 years, 5 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:

Index: tools/picture_utils.cpp

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

index 597fd4878f338c75aa2e594141768b4e621fa017..6a35dd1d70f2e4233fbfd21544acfa5a57f4a48f 100644

--- a/tools/picture_utils.cpp

+++ b/tools/picture_utils.cpp

@@ -55,12 +55,12 @@ namespace sk_tools {

const char *subdirOrNull, const SkString& baseName) {

SkString partialPath;

if (subdirOrNull) {

- partialPath = SkOSPath::SkPathJoin(dirPath.c_str(), subdirOrNull);

+ partialPath = SkOSPath::Join(dirPath.c_str(), subdirOrNull);

sk_mkdir(partialPath.c_str());

} else {

partialPath.set(dirPath);

}

- SkString fullPath = SkOSPath::SkPathJoin(partialPath.c_str(), baseName.c_str());

+ SkString fullPath = SkOSPath::Join(partialPath.c_str(), baseName.c_str());

if (SkImageEncoder::EncodeFile(fullPath.c_str(), bm, SkImageEncoder::kPNG_Type, 100)) {

return true;

} else {

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