diff options
author | 2009-06-15 13:04:45 +0000 | |
---|---|---|
committer | 2009-06-15 13:04:45 +0000 | |
commit | b3ade9d1b0a63f8f0dc3bee5785e930c8e84311d (patch) | |
tree | eb35c1c777a537e2d550d6855c3a714867e25ddb /samplecode | |
parent | 5119bdb952025a30f115b9c6a187173956e55097 (diff) |
add optional Format* parameter to decoder helper functions.
git-svn-id: http://skia.googlecode.com/svn/trunk@215 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode')
-rw-r--r-- | samplecode/SampleFilter2.cpp | 4 | ||||
-rw-r--r-- | samplecode/SampleImage.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp index 1800eb90be..e181870fc6 100644 --- a/samplecode/SampleFilter2.cpp +++ b/samplecode/SampleFilter2.cpp @@ -31,12 +31,12 @@ public: for (int i = 0; i < fBitmapCount/2; i++) { SkImageDecoder::DecodeFile(gNames[i], &fBitmaps[i], SkBitmap::kARGB_8888_Config, - SkImageDecoder::kDecodePixels_Mode); + SkImageDecoder::kDecodePixels_Mode, NULL); } for (int i = fBitmapCount/2; i < fBitmapCount; i++) { SkImageDecoder::DecodeFile(gNames[i-fBitmapCount/2], &fBitmaps[i], SkBitmap::kRGB_565_Config, - SkImageDecoder::kDecodePixels_Mode); + SkImageDecoder::kDecodePixels_Mode, NULL); } fCurrIndex = 0; } diff --git a/samplecode/SampleImage.cpp b/samplecode/SampleImage.cpp index 7683e633d6..69cbd794d7 100644 --- a/samplecode/SampleImage.cpp +++ b/samplecode/SampleImage.cpp @@ -27,7 +27,7 @@ static bool SetImageRef(SkBitmap* bitmap, SkStream* stream, SkBitmap::Config pref, const char name[] = NULL) { if (SkImageDecoder::DecodeStream(stream, bitmap, pref, - SkImageDecoder::kDecodeBounds_Mode)) { + SkImageDecoder::kDecodeBounds_Mode, NULL)) { SkASSERT(bitmap->config() != SkBitmap::kNo_Config); SkImageRef* ref = new SkImageRef_GlobalPool(stream, bitmap->config()); |