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 "SkBmpCodec.h" | 8 #include "SkBmpCodec.h" |
9 #include "SkCodec.h" | 9 #include "SkCodec.h" |
10 #include "SkCodecPriv.h" | 10 #include "SkCodecPriv.h" |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
107 return nullptr; | 107 return nullptr; |
108 } | 108 } |
109 | 109 |
110 SkCodec* SkCodec::NewFromData(SkData* data, SkPngChunkReader* reader) { | 110 SkCodec* SkCodec::NewFromData(SkData* data, SkPngChunkReader* reader) { |
111 if (!data) { | 111 if (!data) { |
112 return nullptr; | 112 return nullptr; |
113 } | 113 } |
114 return NewFromStream(new SkMemoryStream(data), reader); | 114 return NewFromStream(new SkMemoryStream(data), reader); |
115 } | 115 } |
116 | 116 |
117 SkCodec::SkCodec(const SkImageInfo& info, SkStream* stream, sk_sp<SkColorSpace> colorSpace, | 117 SkCodec::SkCodec(const SkEncodedInfo& info, SkStream* stream, sk_sp<SkColorSpace > colorSpace, |
118 Origin origin) | 118 Origin origin) |
119 : fSrcInfo(info) | 119 : fEncodedInfo(info) |
120 , fSrcInfo(info.makeImageInfo()) | |
scroggo
2016/03/23 14:48:50
Alternatively, we could lazily create this when as
msarett
2016/03/24 16:20:44
SGTM.
The reason that I did it this way is that,
| |
120 , fStream(stream) | 121 , fStream(stream) |
121 , fNeedsRewind(false) | 122 , fNeedsRewind(false) |
122 , fColorSpace(colorSpace) | 123 , fColorSpace(colorSpace) |
123 , fOrigin(origin) | 124 , fOrigin(origin) |
124 , fDstInfo() | 125 , fDstInfo() |
125 , fOptions() | 126 , fOptions() |
126 , fCurrScanline(-1) | 127 , fCurrScanline(-1) |
127 {} | 128 {} |
128 | 129 |
129 SkCodec::~SkCodec() {} | 130 SkCodec::~SkCodec() {} |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
381 SkASSERT(1 == linesRequested || this->getInfo().height() == linesReq uested); | 382 SkASSERT(1 == linesRequested || this->getInfo().height() == linesReq uested); |
382 const SkImageInfo fillInfo = info.makeWH(fillWidth, 1); | 383 const SkImageInfo fillInfo = info.makeWH(fillWidth, 1); |
383 for (int srcY = linesDecoded; srcY < linesRequested; srcY++) { | 384 for (int srcY = linesDecoded; srcY < linesRequested; srcY++) { |
384 fillDst = SkTAddOffset<void>(dst, this->outputScanline(srcY) * r owBytes); | 385 fillDst = SkTAddOffset<void>(dst, this->outputScanline(srcY) * r owBytes); |
385 fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, samp ler); | 386 fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, samp ler); |
386 } | 387 } |
387 break; | 388 break; |
388 } | 389 } |
389 } | 390 } |
390 } | 391 } |
OLD | NEW |