diff options
| author | Mike Reed <reed@google.com> | 2009-06-15 12:37:46 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2009-06-15 12:51:30 -0400 |
| commit | f294d10d594ac335ea3bd09caec89004d41edc5c (patch) | |
| tree | 4e6b485f97bee16f397c04c66cb3ffa3d1fee2b8 /src/images | |
| parent | f87ea139deed57504b433fc4e1bf98c85ef0da80 (diff) | |
| download | external_skia-f294d10d594ac335ea3bd09caec89004d41edc5c.zip external_skia-f294d10d594ac335ea3bd09caec89004d41edc5c.tar.gz external_skia-f294d10d594ac335ea3bd09caec89004d41edc5c.tar.bz2 | |
add constY flag to shaders
add opaque special case to 16bit blitter
add Format optional arg to decoder helpers
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkImageDecoder.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp index b910df6..4f9fa9b 100644 --- a/src/images/SkImageDecoder.cpp +++ b/src/images/SkImageDecoder.cpp @@ -120,13 +120,13 @@ bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm, /////////////////////////////////////////////////////////////////////////////// bool SkImageDecoder::DecodeFile(const char file[], SkBitmap* bm, - SkBitmap::Config pref, Mode mode) { + SkBitmap::Config pref, Mode mode, Format* format) { SkASSERT(file); SkASSERT(bm); SkFILEStream stream(file); if (stream.isValid()) { - if (SkImageDecoder::DecodeStream(&stream, bm, pref, mode)) { + if (SkImageDecoder::DecodeStream(&stream, bm, pref, mode, format)) { bm->pixelRef()->setURI(file); } return true; @@ -135,18 +135,18 @@ bool SkImageDecoder::DecodeFile(const char file[], SkBitmap* bm, } bool SkImageDecoder::DecodeMemory(const void* buffer, size_t size, SkBitmap* bm, - SkBitmap::Config pref, Mode mode) { + SkBitmap::Config pref, Mode mode, Format* format) { if (0 == size) { return false; } SkASSERT(buffer); SkMemoryStream stream(buffer, size); - return SkImageDecoder::DecodeStream(&stream, bm, pref, mode); + return SkImageDecoder::DecodeStream(&stream, bm, pref, mode, format); } bool SkImageDecoder::DecodeStream(SkStream* stream, SkBitmap* bm, - SkBitmap::Config pref, Mode mode) { + SkBitmap::Config pref, Mode mode, Format* format) { SkASSERT(stream); SkASSERT(bm); @@ -155,6 +155,9 @@ bool SkImageDecoder::DecodeStream(SkStream* stream, SkBitmap* bm, if (NULL != codec) { success = codec->decode(stream, bm, pref, mode); + if (success && format) { + *format = codec->getFormat(); + } delete codec; } return success; |