| OLD | NEW |
| 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 15 matching lines...) Expand all Loading... |
| 26 return nullptr; | 26 return nullptr; |
| 27 } | 27 } |
| 28 | 28 |
| 29 switch (codec->getEncodedFormat()) { | 29 switch (codec->getEncodedFormat()) { |
| 30 case kWEBP_SkEncodedFormat: | 30 case kWEBP_SkEncodedFormat: |
| 31 return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach()); | 31 return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach()); |
| 32 case kPNG_SkEncodedFormat: | 32 case kPNG_SkEncodedFormat: |
| 33 case kJPEG_SkEncodedFormat: | 33 case kJPEG_SkEncodedFormat: |
| 34 case kWBMP_SkEncodedFormat: | 34 case kWBMP_SkEncodedFormat: |
| 35 case kBMP_SkEncodedFormat: | 35 case kBMP_SkEncodedFormat: |
| 36 case kGIF_SkEncodedFormat: |
| 36 return new SkSampledCodec(codec.detach()); | 37 return new SkSampledCodec(codec.detach()); |
| 37 default: | 38 default: |
| 38 // FIXME: SkSampledCodec is temporarily disabled for other formats | 39 // FIXME: SkSampledCodec is temporarily disabled for other formats |
| 39 // while focusing on the formats that are supported by | 40 // while focusing on the formats that are supported by |
| 40 // BitmapRegionDecoder. | 41 // BitmapRegionDecoder. |
| 41 return nullptr; | 42 return nullptr; |
| 42 } | 43 } |
| 43 } | 44 } |
| 44 | 45 |
| 45 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data) { | 46 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data) { |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 } | 123 } |
| 123 } | 124 } |
| 124 | 125 |
| 125 return this->onGetAndroidPixels(info, pixels, rowBytes, *options); | 126 return this->onGetAndroidPixels(info, pixels, rowBytes, *options); |
| 126 } | 127 } |
| 127 | 128 |
| 128 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void*
pixels, | 129 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void*
pixels, |
| 129 size_t rowBytes) { | 130 size_t rowBytes) { |
| 130 return this->getAndroidPixels(info, pixels, rowBytes, nullptr); | 131 return this->getAndroidPixels(info, pixels, rowBytes, nullptr); |
| 131 } | 132 } |
| OLD | NEW |