Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1181)

Unified Diff: tools/render_pictures_main.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/render_pdfs_main.cpp ('k') | tools/skimage_main.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/render_pictures_main.cpp
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index c2c7875b282cc6cfbd8a0aa6b8a38eba0eecb678..e2f772908f7f3abde45cc04ce365341821e11c7e 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -123,7 +123,7 @@ static bool write_image_to_file(const void* buffer, size_t size, SkBitmap* bitma
SkString name = SkStringPrintf("%s_%d%s", gInputFileName.c_str(), gImageNo++,
get_suffix_from_format(format));
SkString dir(FLAGS_writePath[0]);
- outPath = SkOSPath::SkPathJoin(dir.c_str(), name.c_str());
+ outPath = SkOSPath::Join(dir.c_str(), name.c_str());
SkFILEWStream fileStream(outPath.c_str());
if (!(fileStream.isValid() && fileStream.write(buffer, size))) {
SkDebugf("Failed to write encoded data to \"%s\"\n", outPath.c_str());
@@ -142,7 +142,7 @@ static bool render_picture_internal(const SkString& inputPath, const SkString* w
const SkString* mismatchPath,
sk_tools::PictureRenderer& renderer,
SkBitmap** out) {
- SkString inputFilename = SkOSPath::SkBasename(inputPath.c_str());
+ SkString inputFilename = SkOSPath::Basename(inputPath.c_str());
SkString writePathString;
if (NULL != writePath && writePath->size() > 0 && !FLAGS_writeEncodedImages) {
writePathString.set(*writePath);
@@ -345,7 +345,7 @@ static bool render_picture(const SkString& inputPath, const SkString* writePath,
if (FLAGS_writeWholeImage) {
sk_tools::force_all_opaque(*bitmap);
- SkString inputFilename = SkOSPath::SkBasename(inputPath.c_str());
+ SkString inputFilename = SkOSPath::Basename(inputPath.c_str());
SkString outputFilename(inputFilename);
sk_tools::replace_char(&outputFilename, '.', '_');
outputFilename.append(".png");
@@ -379,7 +379,7 @@ static int process_input(const char* input, const SkString* writePath,
SkDebugf("process_input, %s\n", input);
if (iter.next(&inputFilename)) {
do {
- SkString inputPath = SkOSPath::SkPathJoin(input, inputFilename.c_str());
+ SkString inputPath = SkOSPath::Join(input, inputFilename.c_str());
if (!render_picture(inputPath, writePath, mismatchPath, renderer, jsonSummaryPtr)) {
++failures;
}
« no previous file with comments | « tools/render_pdfs_main.cpp ('k') | tools/skimage_main.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698