| Index: samplecode/SampleApp.cpp
|
| diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
|
| index 27365e0b879307aa50cc70d660ea2126caf4992b..a3e9b248ff5f064cb38d8699be3d058c98fbdd7e 100644
|
| --- a/samplecode/SampleApp.cpp
|
| +++ b/samplecode/SampleApp.cpp
|
| @@ -755,7 +755,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
|
| SkString filename;
|
| while (iter.next(&filename)) {
|
| *fSamples.append() = new PictFileFactory(
|
| - SkOSPath::SkPathJoin(FLAGS_pictureDir[0], filename.c_str()));
|
| + SkOSPath::Join(FLAGS_pictureDir[0], filename.c_str()));
|
| }
|
| }
|
| if (!FLAGS_picture.isEmpty()) {
|
| @@ -769,7 +769,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
|
| SkString filename;
|
| while (iter.next(&filename)) {
|
| *fSamples.append() = new PdfFileViewerFactory(
|
| - SkOSPath::SkPathJoin(FLAGS_pictureDir[0], filename.c_str()));
|
| + SkOSPath::Join(FLAGS_pictureDir[0], filename.c_str()));
|
| }
|
| }
|
| #endif
|
|
|