diff options
| author |  msarett <msarett@google.com> | 2015-11-17 11:18:03 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-17 11:18:03 -0800 |
| commit | 5af4e0bc8fd17944f3c0527462aeba367f6d590a (patch) | |
| tree | ff0c7b83d85fc5480879732e8e7cee68757fc391 /dm/DM.cpp | |
| parent | c08d53ee175e190254d8fd6659d9ad051ac0ba46 (diff) | |
Make SkAndroidCodec support gif
Involves a few bug fixes in SkCodec_libgif and a bit more
complexity in SkSwizzler.
BUG=skia:4405
Review URL: https://codereview.chromium.org/1445313002
Diffstat (limited to 'dm/DM.cpp')
| -rw-r--r-- | dm/DM.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -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: - 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)) { |