diff options
author | 2009-06-15 18:45:19 +0000 | |
---|---|---|
committer | 2009-06-15 18:45:19 +0000 | |
commit | 31d1c64bd54dd2b216846a30da4cc2e96765ec5f (patch) | |
tree | b78d021c3a5329d4c07c789178ce7a5568b13cd3 /include/images/SkImageDecoder.h | |
parent | 9a74d313452f30629e2615eb8cbfe902433582c0 (diff) |
ws fixes
git-svn-id: http://skia.googlecode.com/svn/trunk@217 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/images/SkImageDecoder.h')
-rw-r--r-- | include/images/SkImageDecoder.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/images/SkImageDecoder.h b/include/images/SkImageDecoder.h index d293cec774..de63345922 100644 --- a/include/images/SkImageDecoder.h +++ b/include/images/SkImageDecoder.h @@ -160,13 +160,13 @@ public: there is a conflict (e.g. the image has per-pixel alpha and the bitmap's config does not support that), in which case the decoder will choose a closest match configuration. - + @param format On success, if format is non-null, it is set to the format of the decoded file. On failure it is ignored. */ static bool DecodeFile(const char file[], SkBitmap* bitmap, SkBitmap::Config prefConfig, Mode, - Format* format); + Format* format = NULL); static bool DecodeFile(const char file[], SkBitmap* bitmap) { return DecodeFile(file, bitmap, SkBitmap::kNo_Config, kDecodePixels_Mode, NULL); @@ -180,13 +180,13 @@ public: there is a conflict (e.g. the image has per-pixel alpha and the bitmap's config does not support that), in which case the decoder will choose a closest match configuration. - - @param format On success, if format is non-null, it is set to the format + + @param format On success, if format is non-null, it is set to the format of the decoded buffer. On failure it is ignored. */ static bool DecodeMemory(const void* buffer, size_t size, SkBitmap* bitmap, SkBitmap::Config prefConfig, Mode, - Format* format); + Format* format = NULL); static bool DecodeMemory(const void* buffer, size_t size, SkBitmap* bitmap){ return DecodeMemory(buffer, size, bitmap, SkBitmap::kNo_Config, kDecodePixels_Mode, NULL); @@ -200,13 +200,13 @@ public: format, unless there is a conflict (e.g. the image has per-pixel alpha and the bitmap's config does not support that), in which case the decoder will choose a closest match configuration. - + @param format On success, if format is non-null, it is set to the format of the decoded stream. On failure it is ignored. */ static bool DecodeStream(SkStream* stream, SkBitmap* bitmap, SkBitmap::Config prefConfig, Mode, - Format* format); + Format* format = NULL); static bool DecodeStream(SkStream* stream, SkBitmap* bitmap) { return DecodeStream(stream, bitmap, SkBitmap::kNo_Config, kDecodePixels_Mode, NULL); |