Chromium Code Reviews| Index: dm/DM.cpp |
| diff --git a/dm/DM.cpp b/dm/DM.cpp |
| index 0cbf9440dbf83e9f80d45dfd9cce984499f2a0cf..8873dcabbe591792fec88dc10cc4feaacd330c11 100644 |
| --- a/dm/DM.cpp |
| +++ b/dm/DM.cpp |
| @@ -230,9 +230,6 @@ static void push_codec_src(Path path, CodecSrc::Mode mode, CodecSrc::DstColorTyp |
| case CodecSrc::kScanline_Mode: |
| folder.append("scanline"); |
| break; |
| - case CodecSrc::kScanline_Subset_Mode: |
|
msarett
2015/11/16 23:20:58
I'm kind of on the fence about deleting this test.
scroggo
2015/11/17 14:56:26
It sounds like we have a bug that isn't being caug
msarett
2015/11/17 18:00:50
Well, the bug is that we don't decode subsets prop
scroggo
2015/11/17 18:18:25
Ah, of course. Yes, I think it makes sense to just
|
| - folder.append("scanline_subset"); |
| - break; |
| case CodecSrc::kStripe_Mode: |
| folder.append("stripe"); |
| break; |
| @@ -310,7 +307,7 @@ static void push_codec_srcs(Path path) { |
| const float nativeScales[] = { 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.750f, 0.875f, 1.0f }; |
| const CodecSrc::Mode nativeModes[] = { CodecSrc::kCodec_Mode, CodecSrc::kScanline_Mode, |
| - CodecSrc::kScanline_Subset_Mode, CodecSrc::kStripe_Mode, CodecSrc::kSubset_Mode }; |
| + CodecSrc::kStripe_Mode, CodecSrc::kSubset_Mode }; |
| CodecSrc::DstColorType colorTypes[3]; |
| uint32_t numColorTypes; |
| @@ -363,8 +360,8 @@ static void push_codec_srcs(Path path) { |
| // The following image types are only supported by BitmapFactory, |
| // so we only need to test full image decodes. |
| static const char* fullExts[] = { |
| - "wbmp", "bmp", |
| - "WBMP", "BMP", |
| + "wbmp", "bmp", "gif", |
| + "WBMP", "BMP", "GIF", |
| }; |
| for (const char* ext : fullExts) { |
| if (path.endsWith(ext)) { |