diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-28 16:45:07 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-28 16:45:07 +0000 |
| commit | ccd7afb6fb2df9774e57fb4d7f62f9504cabf03e (patch) | |
| tree | 54818885b59f98ac958e6c35d67109b098f26a19 /gm/image.cpp | |
| parent | 7b06ba45b34855a5bb16f9c729813173d7dfe47d (diff) | |
Reland 'Add path utils, plus a test for it.'
Build SkPathJoin and SkBasename on windows also.
Previous CL did not build on Windows because the two functions were
accidentally placed inside an ifdef that did not include windows.
Move the functions to the top of the file, and add a comment by the
endif for clarity.
Previously reviewed at https://codereview.chromium.org/15747004/
Review URL: https://codereview.chromium.org/15740024
git-svn-id: http://skia.googlecode.com/svn/trunk@9295 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/image.cpp')
| -rw-r--r-- | gm/image.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gm/image.cpp b/gm/image.cpp index 8578e510ba..71fe0e176f 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -31,6 +31,9 @@ static SkData* fileToData(const char path[]) { } static void drawJpeg(SkCanvas* canvas, const SkISize& size) { + // TODO: Make this draw a file that is checked in, so it can + // be exercised on machines other than mike's. Will require a + // rebaseline. SkAutoDataUnref data(fileToData("/Users/mike/Downloads/skia.google.jpeg")); SkImage* image = SkImage::NewEncodedData(data); if (image) { |