| 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 "SkCodec.h" | 8 #include "SkCodec.h" |
| 9 #include "SkImageInfo.h" | 9 #include "SkImageInfo.h" |
| 10 #include "SkStream.h" | 10 #include "SkStream.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 /* | 33 /* |
| 34 * Chooses the best dimensions given the desired scale | 34 * Chooses the best dimensions given the desired scale |
| 35 */ | 35 */ |
| 36 SkISize onGetScaledDimensions(float desiredScale) const override; | 36 SkISize onGetScaledDimensions(float desiredScale) const override; |
| 37 | 37 |
| 38 bool onDimensionsSupported(const SkISize&) override; | 38 bool onDimensionsSupported(const SkISize&) override; |
| 39 | 39 |
| 40 /* | 40 /* |
| 41 * Initiates the Ico decode | 41 * Initiates the Ico decode |
| 42 */ | 42 */ |
| 43 Result onGetPixels(const SkImageInfo& dstInfo, void* dst, | 43 Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes
, const Options&, |
| 44 size_t dstRowBytes, const Options&, SkPMColor*, int*) | 44 SkPMColor*, int*, int*) override; |
| 45 override; | |
| 46 | 45 |
| 47 SkEncodedFormat onGetEncodedFormat() const override { | 46 SkEncodedFormat onGetEncodedFormat() const override { |
| 48 return kICO_SkEncodedFormat; | 47 return kICO_SkEncodedFormat; |
| 49 } | 48 } |
| 50 | 49 |
| 51 private: | 50 private: |
| 52 | 51 |
| 53 /* | 52 /* |
| 54 * Constructor called by NewFromStream | 53 * Constructor called by NewFromStream |
| 55 * @param embeddedCodecs codecs for the embedded images, takes ownership | 54 * @param embeddedCodecs codecs for the embedded images, takes ownership |
| 56 */ | 55 */ |
| 57 SkIcoCodec(const SkImageInfo& srcInfo, | 56 SkIcoCodec(const SkImageInfo& srcInfo, |
| 58 SkTArray<SkAutoTDelete<SkCodec>, true>* embeddedCodecs); | 57 SkTArray<SkAutoTDelete<SkCodec>, true>* embeddedCodecs); |
| 59 | 58 |
| 60 SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>> | 59 SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>> |
| 61 fEmbeddedCodecs; // owned | 60 fEmbeddedCodecs; // owned |
| 62 | 61 |
| 63 typedef SkCodec INHERITED; | 62 typedef SkCodec INHERITED; |
| 64 }; | 63 }; |
| OLD | NEW |