aboutsummaryrefslogtreecommitdiff
path: root/samplecode/SampleUnpremul.cpp
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2014-07-28 19:26:58 -0700
committerCommit bot <commit-bot@chromium.org>2014-07-28 19:26:58 -0700
commita8e2e1504b9af6ba791637f228debaa23953064a (patch)
treec4dc50d10bb27a4bfd263f877cb7d602f6779afc /samplecode/SampleUnpremul.cpp
parent2bff230d835fbc84f0ce8b2e7a399fe8416ec7c8 (diff)
Cleanup: Rename SkOSPath functions.
Mostly for brevity and matches better with Python: Python | Old C++ | New C++ os.path.join | SkOSPath::SkPathJoin | SkOSPath::Join os.path.basename | SkOSPath::SkBasename | SkOSPath::Basename BUG=None TEST=make all R=mtklein@google.com, bsalomon@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/428443002
Diffstat (limited to 'samplecode/SampleUnpremul.cpp')
-rw-r--r--samplecode/SampleUnpremul.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index ab99ecb8ce..bfe69e0b50 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -106,7 +106,7 @@ protected:
}
// Name, size of the file, and whether or not it is premultiplied.
- SkString header(SkOSPath::SkBasename(fCurrFile.c_str()));
+ SkString header(SkOSPath::Basename(fCurrFile.c_str()));
header.appendf(" [%dx%d] %s", fBitmap.width(), fBitmap.height(),
(fPremul ? "premultiplied" : "unpremultiplied"));
canvas->drawText(header.c_str(), header.size(), 0, height, paint);
@@ -167,7 +167,7 @@ private:
return;
}
}
- fCurrFile = SkOSPath::SkPathJoin(fResPath.c_str(), basename.c_str());
+ fCurrFile = SkOSPath::Join(fResPath.c_str(), basename.c_str());
this->decodeCurrFile();
}