| Index: src/images/SkImageDecoder.cpp
|
| diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
|
| index c16efcf1f32797330cf39d29d10ed2da2f5ee951..fba1713592be7116b0998ec9e71cb883c51cdd60 100644
|
| --- a/src/images/SkImageDecoder.cpp
|
| +++ b/src/images/SkImageDecoder.cpp
|
| @@ -18,17 +18,6 @@ SK_DEFINE_INST_COUNT(SkImageDecoder::Peeker)
|
| SK_DEFINE_INST_COUNT(SkImageDecoder::Chooser)
|
| SK_DEFINE_INST_COUNT(SkImageDecoderFactory)
|
|
|
| -const char *SkImageDecoder::sFormatName[] = {
|
| - "Unknown Format",
|
| - "BMP",
|
| - "GIF",
|
| - "ICO",
|
| - "JPEG",
|
| - "PNG",
|
| - "WBMP",
|
| - "WEBP",
|
| -};
|
| -
|
| static SkBitmap::Config gDeviceConfig = SkBitmap::kNo_Config;
|
|
|
| SkBitmap::Config SkImageDecoder::GetDeviceConfig()
|
| @@ -60,8 +49,27 @@ SkImageDecoder::Format SkImageDecoder::getFormat() const {
|
| }
|
|
|
| const char* SkImageDecoder::getFormatName() const {
|
| - SkASSERT(SK_ARRAY_COUNT(sFormatName) == kLastKnownFormat);
|
| - return sFormatName[this->getFormat()];
|
| + switch (this->getFormat()) {
|
| + case kUnknown_Format:
|
| + return "Unknown Format";
|
| + case kBMP_Format:
|
| + return "BMP";
|
| + case kGIF_Format:
|
| + return "GIF";
|
| + case kICO_Format:
|
| + return "ICO";
|
| + case kJPEG_Format:
|
| + return "JPEG";
|
| + case kPNG_Format:
|
| + return "PNG";
|
| + case kWBMP_Format:
|
| + return "WBMP";
|
| + case kWEBP_Format:
|
| + return "WEBP";
|
| + default:
|
| + SkASSERT(!"Invalid format type!");
|
| + }
|
| + return "Unknown Format";
|
| }
|
|
|
| SkImageDecoder::Peeker* SkImageDecoder::setPeeker(Peeker* peeker) {
|
|
|