| 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 23 matching lines...) Expand all Loading... |
| 34 case kICO_SkEncodedFormat: | 34 case kICO_SkEncodedFormat: |
| 35 #endif | 35 #endif |
| 36 #ifdef SK_CODEC_DECODES_JPEG | 36 #ifdef SK_CODEC_DECODES_JPEG |
| 37 case kJPEG_SkEncodedFormat: | 37 case kJPEG_SkEncodedFormat: |
| 38 #endif | 38 #endif |
| 39 #ifdef SK_CODEC_DECODES_GIF | 39 #ifdef SK_CODEC_DECODES_GIF |
| 40 case kGIF_SkEncodedFormat: | 40 case kGIF_SkEncodedFormat: |
| 41 #endif | 41 #endif |
| 42 case kBMP_SkEncodedFormat: | 42 case kBMP_SkEncodedFormat: |
| 43 case kWBMP_SkEncodedFormat: | 43 case kWBMP_SkEncodedFormat: |
| 44 return new SkSampledCodec(codec.detach()); | 44 return new SkSampledCodec(codec.release()); |
| 45 #ifdef SK_CODEC_DECODES_WEBP | 45 #ifdef SK_CODEC_DECODES_WEBP |
| 46 case kWEBP_SkEncodedFormat: | 46 case kWEBP_SkEncodedFormat: |
| 47 return new SkWebpAdapterCodec((SkWebpCodec*) codec.detach()); | 47 return new SkWebpAdapterCodec((SkWebpCodec*) codec.release()); |
| 48 #endif | 48 #endif |
| 49 #ifdef SK_CODEC_DECODES_RAW | 49 #ifdef SK_CODEC_DECODES_RAW |
| 50 case kDNG_SkEncodedFormat: | 50 case kDNG_SkEncodedFormat: |
| 51 return new SkRawAdapterCodec((SkRawCodec*)codec.detach()); | 51 return new SkRawAdapterCodec((SkRawCodec*)codec.release()); |
| 52 #endif | 52 #endif |
| 53 default: | 53 default: |
| 54 return nullptr; | 54 return nullptr; |
| 55 } | 55 } |
| 56 } | 56 } |
| 57 | 57 |
| 58 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chun
kReader) { | 58 SkAndroidCodec* SkAndroidCodec::NewFromData(SkData* data, SkPngChunkReader* chun
kReader) { |
| 59 if (!data) { | 59 if (!data) { |
| 60 return nullptr; | 60 return nullptr; |
| 61 } | 61 } |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 } | 188 } |
| 189 } | 189 } |
| 190 | 190 |
| 191 return this->onGetAndroidPixels(info, pixels, rowBytes, *options); | 191 return this->onGetAndroidPixels(info, pixels, rowBytes, *options); |
| 192 } | 192 } |
| 193 | 193 |
| 194 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void*
pixels, | 194 SkCodec::Result SkAndroidCodec::getAndroidPixels(const SkImageInfo& info, void*
pixels, |
| 195 size_t rowBytes) { | 195 size_t rowBytes) { |
| 196 return this->getAndroidPixels(info, pixels, rowBytes, nullptr); | 196 return this->getAndroidPixels(info, pixels, rowBytes, nullptr); |
| 197 } | 197 } |
| OLD | NEW |