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

Side by Side Diff: src/codec/SkCodec_libico.h

Issue 1332053002: Fill incomplete images in SkCodec parent class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase on merged SkCodec and SkScanlineDecoder Created 5 years, 2 months 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
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 "SkCodec.h" 8 #include "SkCodec.h"
9 #include "SkImageInfo.h" 9 #include "SkImageInfo.h"
10 #include "SkStream.h" 10 #include "SkStream.h"
(...skipping 20 matching lines...) Expand all
31 protected: 31 protected:
32 32
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 /* 38 /*
39 * Initiates the Ico decode 39 * Initiates the Ico decode
40 */ 40 */
41 Result onGetPixels(const SkImageInfo& dstInfo, void* dst, 41 Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t dstRowBytes , const Options&,
42 size_t dstRowBytes, const Options&, SkPMColor*, int*) 42 SkPMColor*, int*, int*) override;
43 override;
44 43
45 SkEncodedFormat onGetEncodedFormat() const override { 44 SkEncodedFormat onGetEncodedFormat() const override {
46 return kICO_SkEncodedFormat; 45 return kICO_SkEncodedFormat;
47 } 46 }
48 47
49 private: 48 private:
50 49
51 /* 50 /*
52 * Constructor called by NewFromStream 51 * Constructor called by NewFromStream
53 * @param embeddedCodecs codecs for the embedded images, takes ownership 52 * @param embeddedCodecs codecs for the embedded images, takes ownership
54 */ 53 */
55 SkIcoCodec(const SkImageInfo& srcInfo, 54 SkIcoCodec(const SkImageInfo& srcInfo,
56 SkTArray<SkAutoTDelete<SkCodec>, true>* embeddedCodecs); 55 SkTArray<SkAutoTDelete<SkCodec>, true>* embeddedCodecs);
57 56
58 SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>> 57 SkAutoTDelete<SkTArray<SkAutoTDelete<SkCodec>, true>>
59 fEmbeddedCodecs; // owned 58 fEmbeddedCodecs; // owned
60 59
61 typedef SkCodec INHERITED; 60 typedef SkCodec INHERITED;
62 }; 61 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698