diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-27 14:14:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-27 14:14:22 +0000 |
| commit | 2d970b5128f7270cd01a93e4ce68d0c3ea67ac71 (patch) | |
| tree | 2592f202dfb36d05e42004ecdb237ddd4471ef9e /samplecode | |
| parent | 851155c28e18e3f5b702ef15ee7bfb12f3cbacda (diff) | |
hide discardable factory from public imagegenerator api
BUG=skia:
R=halcanary@google.com, scroggo@google.com, djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/295243006
git-svn-id: http://skia.googlecode.com/svn/trunk@14889 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleEncode.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SamplePicture.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleEncode.cpp b/samplecode/SampleEncode.cpp index 080c05f5d7..e65b2d3855 100644 --- a/samplecode/SampleEncode.cpp +++ b/samplecode/SampleEncode.cpp @@ -196,7 +196,7 @@ protected: if (!SkInstallDiscardablePixelRef( SkDecodingImageGenerator::Create(encoded, SkDecodingImageGenerator::Options()), - &bm, NULL)) { + &bm)) { SkDebugf("[%s:%d] failed to decode %s%s\n", __FILE__, __LINE__,gConfigLabels[i], gExt[j]); } diff --git a/samplecode/SamplePicture.cpp b/samplecode/SamplePicture.cpp index e6969037fd..f242c21944 100644 --- a/samplecode/SamplePicture.cpp +++ b/samplecode/SamplePicture.cpp @@ -41,7 +41,7 @@ static SkBitmap load_bitmap() { SkAutoDataUnref data(SkData::NewFromFileName(path.c_str())); if (data.get() != NULL) { SkInstallDiscardablePixelRef(SkDecodingImageGenerator::Create( - data, SkDecodingImageGenerator::Options()), &bm, NULL); + data, SkDecodingImageGenerator::Options()), &bm); } return bm; } |