Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: src/codec/SkAndroidCodec.cpp

Issue 2045293002: Add support for multiple frames in SkCodec (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix a test - we now draw transparent background for missing color table Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « include/codec/SkCodec.h ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkAndroidCodec.h" 8 #include "SkAndroidCodec.h"
9 #include "SkCodec.h" 9 #include "SkCodec.h"
10 #include "SkCodecPriv.h" 10 #include "SkCodecPriv.h"
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 30
31 switch (codec->getEncodedFormat()) { 31 switch (codec->getEncodedFormat()) {
32 #ifdef SK_HAS_PNG_LIBRARY 32 #ifdef SK_HAS_PNG_LIBRARY
33 case kPNG_SkEncodedFormat: 33 case kPNG_SkEncodedFormat:
34 case kICO_SkEncodedFormat: 34 case kICO_SkEncodedFormat:
35 #endif 35 #endif
36 #ifdef SK_HAS_JPEG_LIBRARY 36 #ifdef SK_HAS_JPEG_LIBRARY
37 case kJPEG_SkEncodedFormat: 37 case kJPEG_SkEncodedFormat:
38 #endif 38 #endif
39 #ifdef SK_HAS_GIF_LIBRARY
40 case kGIF_SkEncodedFormat: 39 case kGIF_SkEncodedFormat:
41 #endif
42 case kBMP_SkEncodedFormat: 40 case kBMP_SkEncodedFormat:
43 case kWBMP_SkEncodedFormat: 41 case kWBMP_SkEncodedFormat:
44 return new SkSampledCodec(codec.release()); 42 return new SkSampledCodec(codec.release());
45 #ifdef SK_HAS_WEBP_LIBRARY 43 #ifdef SK_HAS_WEBP_LIBRARY
46 case kWEBP_SkEncodedFormat: 44 case kWEBP_SkEncodedFormat:
47 return new SkWebpAdapterCodec((SkWebpCodec*) codec.release()); 45 return new SkWebpAdapterCodec((SkWebpCodec*) codec.release());
48 #endif 46 #endif
49 #ifdef SK_CODEC_DECODES_RAW 47 #ifdef SK_CODEC_DECODES_RAW
50 case kDNG_SkEncodedFormat: 48 case kDNG_SkEncodedFormat:
51 return new SkRawAdapterCodec((SkRawCodec*)codec.release()); 49 return new SkRawAdapterCodec((SkRawCodec*)codec.release());
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 } 186 }
189 } 187 }
190 188
191 return this->onGetAndroidPixels(info, pixels, rowBytes, *options); 189 return this->onGetAndroidPixels(info, pixels, rowBytes, *options);
192 } 190 }
193 191
194 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels, 192 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void* pixels,
195 size_t rowBytes) { 193 size_t rowBytes) {
196 return this->getAndroidPixels(info, pixels, rowBytes, nullptr); 194 return this->getAndroidPixels(info, pixels, rowBytes, nullptr);
197 } 195 }
OLDNEW
« no previous file with comments | « include/codec/SkCodec.h ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698