scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright 2015 Google Inc. |
| 3 | * |
| 4 | * Use of this source code is governed by a BSD-style license that can be |
| 5 | * found in the LICENSE file. |
| 6 | */ |
| 7 | |
msarett | b46e5e2 | 2015-07-30 11:36:40 -0700 | [diff] [blame] | 8 | #include "SkBmpCodec.h" |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 9 | #include "SkCodec.h" |
msarett | 8c8f22a | 2015-04-01 06:58:48 -0700 | [diff] [blame] | 10 | #include "SkCodecPriv.h" |
msarett | ad8bcfe | 2016-03-07 07:09:03 -0800 | [diff] [blame] | 11 | #include "SkColorSpace.h" |
Matt Sarett | cf3f234 | 2017-03-23 15:32:25 -0400 | [diff] [blame] | 12 | #include "SkColorSpaceXform_Base.h" |
msarett | 1a46467 | 2016-01-07 13:17:19 -0800 | [diff] [blame] | 13 | #include "SkData.h" |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 14 | #include "SkFrameHolder.h" |
msarett | 1a46467 | 2016-01-07 13:17:19 -0800 | [diff] [blame] | 15 | #include "SkGifCodec.h" |
msarett | f7eb6fc | 2016-09-13 09:04:11 -0700 | [diff] [blame] | 16 | #include "SkHalf.h" |
msarett | 1a46467 | 2016-01-07 13:17:19 -0800 | [diff] [blame] | 17 | #include "SkIcoCodec.h" |
msarett | e16b04a | 2015-04-15 07:32:19 -0700 | [diff] [blame] | 18 | #include "SkJpegCodec.h" |
msarett | ad3a5c6 | 2016-05-06 07:21:26 -0700 | [diff] [blame] | 19 | #ifdef SK_HAS_PNG_LIBRARY |
msarett | be1d555 | 2016-01-21 09:05:23 -0800 | [diff] [blame] | 20 | #include "SkPngCodec.h" |
yujieqin | 916de9f | 2016-01-25 08:26:16 -0800 | [diff] [blame] | 21 | #endif |
msarett | 39b2d5a | 2016-02-17 08:26:31 -0800 | [diff] [blame] | 22 | #include "SkRawCodec.h" |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 23 | #include "SkStream.h" |
msarett | 1a46467 | 2016-01-07 13:17:19 -0800 | [diff] [blame] | 24 | #include "SkWbmpCodec.h" |
scroggo | 6f5e619 | 2015-06-18 12:53:43 -0700 | [diff] [blame] | 25 | #include "SkWebpCodec.h" |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 26 | |
msarett | 7411438 | 2015-03-16 11:55:18 -0700 | [diff] [blame] | 27 | struct DecoderProc { |
scroggo | db30be2 | 2015-12-08 18:54:13 -0800 | [diff] [blame] | 28 | bool (*IsFormat)(const void*, size_t); |
msarett | 7411438 | 2015-03-16 11:55:18 -0700 | [diff] [blame] | 29 | SkCodec* (*NewFromStream)(SkStream*); |
| 30 | }; |
| 31 | |
| 32 | static const DecoderProc gDecoderProcs[] = { |
msarett | ad3a5c6 | 2016-05-06 07:21:26 -0700 | [diff] [blame] | 33 | #ifdef SK_HAS_JPEG_LIBRARY |
msarett | e16b04a | 2015-04-15 07:32:19 -0700 | [diff] [blame] | 34 | { SkJpegCodec::IsJpeg, SkJpegCodec::NewFromStream }, |
msarett | 39b2d5a | 2016-02-17 08:26:31 -0800 | [diff] [blame] | 35 | #endif |
msarett | ad3a5c6 | 2016-05-06 07:21:26 -0700 | [diff] [blame] | 36 | #ifdef SK_HAS_WEBP_LIBRARY |
scroggo | 6f5e619 | 2015-06-18 12:53:43 -0700 | [diff] [blame] | 37 | { SkWebpCodec::IsWebp, SkWebpCodec::NewFromStream }, |
msarett | 39b2d5a | 2016-02-17 08:26:31 -0800 | [diff] [blame] | 38 | #endif |
msarett | 8c8f22a | 2015-04-01 06:58:48 -0700 | [diff] [blame] | 39 | { SkGifCodec::IsGif, SkGifCodec::NewFromStream }, |
msarett | ad3a5c6 | 2016-05-06 07:21:26 -0700 | [diff] [blame] | 40 | #ifdef SK_HAS_PNG_LIBRARY |
msarett | 9bde918 | 2015-03-25 05:27:48 -0700 | [diff] [blame] | 41 | { SkIcoCodec::IsIco, SkIcoCodec::NewFromStream }, |
msarett | 39b2d5a | 2016-02-17 08:26:31 -0800 | [diff] [blame] | 42 | #endif |
halcanary | a096d7a | 2015-03-27 12:16:53 -0700 | [diff] [blame] | 43 | { SkBmpCodec::IsBmp, SkBmpCodec::NewFromStream }, |
| 44 | { SkWbmpCodec::IsWbmp, SkWbmpCodec::NewFromStream } |
msarett | 7411438 | 2015-03-16 11:55:18 -0700 | [diff] [blame] | 45 | }; |
| 46 | |
scroggo | db30be2 | 2015-12-08 18:54:13 -0800 | [diff] [blame] | 47 | size_t SkCodec::MinBufferedBytesNeeded() { |
| 48 | return WEBP_VP8_HEADER_SIZE; |
| 49 | } |
| 50 | |
scroggo | cf98fa9 | 2015-11-23 08:14:40 -0800 | [diff] [blame] | 51 | SkCodec* SkCodec::NewFromStream(SkStream* stream, |
| 52 | SkPngChunkReader* chunkReader) { |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 53 | if (!stream) { |
halcanary | 96fcdcc | 2015-08-27 07:41:13 -0700 | [diff] [blame] | 54 | return nullptr; |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 55 | } |
scroggo | 0a7e69c | 2015-04-03 07:22:22 -0700 | [diff] [blame] | 56 | |
Ben Wagner | 145dbcd | 2016-11-03 14:40:50 -0400 | [diff] [blame] | 57 | std::unique_ptr<SkStream> streamDeleter(stream); |
scroggo | db30be2 | 2015-12-08 18:54:13 -0800 | [diff] [blame] | 58 | |
| 59 | // 14 is enough to read all of the supported types. |
| 60 | const size_t bytesToRead = 14; |
| 61 | SkASSERT(bytesToRead <= MinBufferedBytesNeeded()); |
| 62 | |
| 63 | char buffer[bytesToRead]; |
| 64 | size_t bytesRead = stream->peek(buffer, bytesToRead); |
| 65 | |
| 66 | // It is also possible to have a complete image less than bytesToRead bytes |
| 67 | // (e.g. a 1 x 1 wbmp), meaning peek() would return less than bytesToRead. |
| 68 | // Assume that if bytesRead < bytesToRead, but > 0, the stream is shorter |
| 69 | // than bytesToRead, so pass that directly to the decoder. |
| 70 | // It also is possible the stream uses too small a buffer for peeking, but |
| 71 | // we trust the caller to use a large enough buffer. |
| 72 | |
| 73 | if (0 == bytesRead) { |
scroggo | 3ab9f2e | 2016-01-06 09:53:34 -0800 | [diff] [blame] | 74 | // TODO: After implementing peek in CreateJavaOutputStreamAdaptor.cpp, this |
| 75 | // printf could be useful to notice failures. |
| 76 | // SkCodecPrintf("Encoded image data failed to peek!\n"); |
| 77 | |
scroggo | db30be2 | 2015-12-08 18:54:13 -0800 | [diff] [blame] | 78 | // It is possible the stream does not support peeking, but does support |
| 79 | // rewinding. |
| 80 | // Attempt to read() and pass the actual amount read to the decoder. |
| 81 | bytesRead = stream->read(buffer, bytesToRead); |
| 82 | if (!stream->rewind()) { |
scroggo | 3ab9f2e | 2016-01-06 09:53:34 -0800 | [diff] [blame] | 83 | SkCodecPrintf("Encoded image data could not peek or rewind to determine format!\n"); |
scroggo | db30be2 | 2015-12-08 18:54:13 -0800 | [diff] [blame] | 84 | return nullptr; |
| 85 | } |
| 86 | } |
| 87 | |
scroggo | cf98fa9 | 2015-11-23 08:14:40 -0800 | [diff] [blame] | 88 | // PNG is special, since we want to be able to supply an SkPngChunkReader. |
| 89 | // But this code follows the same pattern as the loop. |
msarett | ad3a5c6 | 2016-05-06 07:21:26 -0700 | [diff] [blame] | 90 | #ifdef SK_HAS_PNG_LIBRARY |
scroggo | db30be2 | 2015-12-08 18:54:13 -0800 | [diff] [blame] | 91 | if (SkPngCodec::IsPng(buffer, bytesRead)) { |
mtklein | 18300a3 | 2016-03-16 13:53:35 -0700 | [diff] [blame] | 92 | return SkPngCodec::NewFromStream(streamDeleter.release(), chunkReader); |
msarett | 39b2d5a | 2016-02-17 08:26:31 -0800 | [diff] [blame] | 93 | } else |
| 94 | #endif |
| 95 | { |
scroggo | cf98fa9 | 2015-11-23 08:14:40 -0800 | [diff] [blame] | 96 | for (DecoderProc proc : gDecoderProcs) { |
scroggo | db30be2 | 2015-12-08 18:54:13 -0800 | [diff] [blame] | 97 | if (proc.IsFormat(buffer, bytesRead)) { |
mtklein | 18300a3 | 2016-03-16 13:53:35 -0700 | [diff] [blame] | 98 | return proc.NewFromStream(streamDeleter.release()); |
scroggo | cf98fa9 | 2015-11-23 08:14:40 -0800 | [diff] [blame] | 99 | } |
msarett | 7411438 | 2015-03-16 11:55:18 -0700 | [diff] [blame] | 100 | } |
yujieqin | 916de9f | 2016-01-25 08:26:16 -0800 | [diff] [blame] | 101 | |
| 102 | #ifdef SK_CODEC_DECODES_RAW |
| 103 | // Try to treat the input as RAW if all the other checks failed. |
mtklein | 18300a3 | 2016-03-16 13:53:35 -0700 | [diff] [blame] | 104 | return SkRawCodec::NewFromStream(streamDeleter.release()); |
yujieqin | 916de9f | 2016-01-25 08:26:16 -0800 | [diff] [blame] | 105 | #endif |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 106 | } |
msarett | 8c8f22a | 2015-04-01 06:58:48 -0700 | [diff] [blame] | 107 | |
msarett | f44631b | 2016-01-13 10:54:20 -0800 | [diff] [blame] | 108 | return nullptr; |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 109 | } |
| 110 | |
reed | 42943c8 | 2016-09-12 12:01:44 -0700 | [diff] [blame] | 111 | SkCodec* SkCodec::NewFromData(sk_sp<SkData> data, SkPngChunkReader* reader) { |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 112 | if (!data) { |
halcanary | 96fcdcc | 2015-08-27 07:41:13 -0700 | [diff] [blame] | 113 | return nullptr; |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 114 | } |
scroggo | cf98fa9 | 2015-11-23 08:14:40 -0800 | [diff] [blame] | 115 | return NewFromStream(new SkMemoryStream(data), reader); |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 116 | } |
| 117 | |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 118 | SkCodec::SkCodec(int width, int height, const SkEncodedInfo& info, |
| 119 | XformFormat srcFormat, SkStream* stream, |
msarett | c30c418 | 2016-04-20 11:53:35 -0700 | [diff] [blame] | 120 | sk_sp<SkColorSpace> colorSpace, Origin origin) |
| 121 | : fEncodedInfo(info) |
msarett | 530c844 | 2016-07-21 11:57:49 -0700 | [diff] [blame] | 122 | , fSrcInfo(info.makeImageInfo(width, height, std::move(colorSpace))) |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 123 | , fSrcXformFormat(srcFormat) |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 124 | , fStream(stream) |
| 125 | , fNeedsRewind(false) |
msarett | 0e6274f | 2016-03-21 08:04:40 -0700 | [diff] [blame] | 126 | , fOrigin(origin) |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 127 | , fDstInfo() |
| 128 | , fOptions() |
| 129 | , fCurrScanline(-1) |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 130 | {} |
| 131 | |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 132 | SkCodec::SkCodec(const SkEncodedInfo& info, const SkImageInfo& imageInfo, |
| 133 | XformFormat srcFormat, SkStream* stream, Origin origin) |
msarett | 549ca32 | 2016-08-17 08:54:08 -0700 | [diff] [blame] | 134 | : fEncodedInfo(info) |
| 135 | , fSrcInfo(imageInfo) |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 136 | , fSrcXformFormat(srcFormat) |
msarett | 549ca32 | 2016-08-17 08:54:08 -0700 | [diff] [blame] | 137 | , fStream(stream) |
| 138 | , fNeedsRewind(false) |
| 139 | , fOrigin(origin) |
| 140 | , fDstInfo() |
| 141 | , fOptions() |
| 142 | , fCurrScanline(-1) |
| 143 | {} |
| 144 | |
scroggo | 9b2cdbf4 | 2015-07-10 12:07:02 -0700 | [diff] [blame] | 145 | SkCodec::~SkCodec() {} |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 146 | |
scroggo | b427db1 | 2015-08-12 07:24:13 -0700 | [diff] [blame] | 147 | bool SkCodec::rewindIfNeeded() { |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 148 | // Store the value of fNeedsRewind so we can update it. Next read will |
| 149 | // require a rewind. |
halcanary | a096d7a | 2015-03-27 12:16:53 -0700 | [diff] [blame] | 150 | const bool needsRewind = fNeedsRewind; |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 151 | fNeedsRewind = true; |
halcanary | a096d7a | 2015-03-27 12:16:53 -0700 | [diff] [blame] | 152 | if (!needsRewind) { |
scroggo | b427db1 | 2015-08-12 07:24:13 -0700 | [diff] [blame] | 153 | return true; |
halcanary | a096d7a | 2015-03-27 12:16:53 -0700 | [diff] [blame] | 154 | } |
scroggo | b427db1 | 2015-08-12 07:24:13 -0700 | [diff] [blame] | 155 | |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 156 | // startScanlineDecode will need to be called before decoding scanlines. |
| 157 | fCurrScanline = -1; |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 158 | // startIncrementalDecode will need to be called before incrementalDecode. |
| 159 | fStartedIncrementalDecode = false; |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 160 | |
scroggo | 19b9153 | 2016-10-24 09:03:26 -0700 | [diff] [blame] | 161 | // Some codecs do not have a stream. They may hold onto their own data or another codec. |
| 162 | // They must handle rewinding themselves. |
| 163 | if (fStream && !fStream->rewind()) { |
scroggo | b427db1 | 2015-08-12 07:24:13 -0700 | [diff] [blame] | 164 | return false; |
| 165 | } |
| 166 | |
| 167 | return this->onRewind(); |
scroggo | f24f224 | 2015-03-03 08:59:20 -0800 | [diff] [blame] | 168 | } |
scroggo | 0524590 | 2015-03-25 11:11:52 -0700 | [diff] [blame] | 169 | |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 170 | static void zero_rect(const SkImageInfo& dstInfo, void* pixels, size_t rowBytes, |
| 171 | SkIRect frameRect) { |
| 172 | if (!frameRect.intersect(dstInfo.bounds())) { |
| 173 | return; |
| 174 | } |
| 175 | const auto info = dstInfo.makeWH(frameRect.width(), frameRect.height()); |
| 176 | const size_t bpp = SkColorTypeBytesPerPixel(dstInfo.colorType()); |
| 177 | const size_t offset = frameRect.x() * bpp + frameRect.y() * rowBytes; |
| 178 | auto* eraseDst = SkTAddOffset<void>(pixels, offset); |
| 179 | SkSampler::Fill(info, eraseDst, rowBytes, 0, SkCodec::kNo_ZeroInitialized); |
| 180 | } |
| 181 | |
| 182 | SkCodec::Result SkCodec::handleFrameIndex(const SkImageInfo& info, void* pixels, size_t rowBytes, |
| 183 | const Options& options) { |
| 184 | const int index = options.fFrameIndex; |
| 185 | if (0 == index) { |
| 186 | return kSuccess; |
| 187 | } |
| 188 | |
| 189 | if (options.fSubset || info.dimensions() != fSrcInfo.dimensions()) { |
| 190 | // If we add support for these, we need to update the code that zeroes |
| 191 | // a kRestoreBGColor frame. |
| 192 | return kInvalidParameters; |
| 193 | } |
| 194 | |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 195 | if (index >= this->onGetFrameCount()) { |
| 196 | return kIncompleteInput; |
| 197 | } |
| 198 | |
| 199 | const auto* frameHolder = this->getFrameHolder(); |
| 200 | SkASSERT(frameHolder); |
| 201 | |
| 202 | const auto* frame = frameHolder->getFrame(index); |
| 203 | SkASSERT(frame); |
| 204 | |
| 205 | const int requiredFrame = frame->getRequiredFrame(); |
| 206 | if (requiredFrame == kNone) { |
| 207 | return kSuccess; |
| 208 | } |
| 209 | |
| 210 | if (options.fPriorFrame != kNone) { |
| 211 | // Check for a valid frame as a starting point. Alternatively, we could |
| 212 | // treat an invalid frame as not providing one, but rejecting it will |
| 213 | // make it easier to catch the mistake. |
| 214 | if (options.fPriorFrame < requiredFrame || options.fPriorFrame >= index) { |
| 215 | return kInvalidParameters; |
| 216 | } |
| 217 | const auto* prevFrame = frameHolder->getFrame(options.fPriorFrame); |
| 218 | switch (prevFrame->getDisposalMethod()) { |
| 219 | case SkCodecAnimation::DisposalMethod::kRestorePrevious: |
| 220 | return kInvalidParameters; |
| 221 | case SkCodecAnimation::DisposalMethod::kRestoreBGColor: |
| 222 | // If a frame after the required frame is provided, there is no |
| 223 | // need to clear, since it must be covered by the desired frame. |
| 224 | if (options.fPriorFrame == requiredFrame) { |
| 225 | zero_rect(info, pixels, rowBytes, prevFrame->frameRect()); |
| 226 | } |
| 227 | break; |
| 228 | default: |
| 229 | break; |
| 230 | } |
| 231 | return kSuccess; |
| 232 | } |
| 233 | |
| 234 | Options prevFrameOptions(options); |
| 235 | prevFrameOptions.fFrameIndex = requiredFrame; |
| 236 | prevFrameOptions.fZeroInitialized = kNo_ZeroInitialized; |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 237 | const Result result = this->getPixels(info, pixels, rowBytes, &prevFrameOptions); |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 238 | if (result == kSuccess) { |
| 239 | const auto* prevFrame = frameHolder->getFrame(requiredFrame); |
| 240 | const auto disposalMethod = prevFrame->getDisposalMethod(); |
| 241 | if (disposalMethod == SkCodecAnimation::DisposalMethod::kRestoreBGColor) { |
| 242 | zero_rect(info, pixels, rowBytes, prevFrame->frameRect()); |
| 243 | } |
| 244 | } |
| 245 | |
| 246 | return result; |
| 247 | } |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 248 | |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 249 | SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 250 | const Options* options) { |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 251 | if (kUnknown_SkColorType == info.colorType()) { |
| 252 | return kInvalidConversion; |
| 253 | } |
halcanary | 96fcdcc | 2015-08-27 07:41:13 -0700 | [diff] [blame] | 254 | if (nullptr == pixels) { |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 255 | return kInvalidParameters; |
| 256 | } |
| 257 | if (rowBytes < info.minRowBytes()) { |
| 258 | return kInvalidParameters; |
| 259 | } |
| 260 | |
scroggo | 3a7701c | 2015-09-30 09:15:14 -0700 | [diff] [blame] | 261 | if (!this->rewindIfNeeded()) { |
| 262 | return kCouldNotRewind; |
| 263 | } |
| 264 | |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 265 | // Default options. |
| 266 | Options optsStorage; |
halcanary | 96fcdcc | 2015-08-27 07:41:13 -0700 | [diff] [blame] | 267 | if (nullptr == options) { |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 268 | options = &optsStorage; |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 269 | } else { |
| 270 | const Result frameIndexResult = this->handleFrameIndex(info, pixels, rowBytes, *options); |
| 271 | if (frameIndexResult != kSuccess) { |
| 272 | return frameIndexResult; |
| 273 | } |
| 274 | if (options->fSubset) { |
| 275 | SkIRect subset(*options->fSubset); |
| 276 | if (!this->onGetValidSubset(&subset) || subset != *options->fSubset) { |
| 277 | // FIXME: How to differentiate between not supporting subset at all |
| 278 | // and not supporting this particular subset? |
| 279 | return kUnimplemented; |
| 280 | } |
scroggo | e7fc14b | 2015-10-02 13:14:46 -0700 | [diff] [blame] | 281 | } |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 282 | } |
scroggo | e7fc14b | 2015-10-02 13:14:46 -0700 | [diff] [blame] | 283 | |
| 284 | // FIXME: Support subsets somehow? Note that this works for SkWebpCodec |
| 285 | // because it supports arbitrary scaling/subset combinations. |
| 286 | if (!this->dimensionsSupported(info.dimensions())) { |
| 287 | return kInvalidScale; |
| 288 | } |
| 289 | |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 290 | fDstInfo = info; |
Leon Scroggins III | 4288657 | 2017-01-27 13:16:28 -0500 | [diff] [blame] | 291 | fOptions = *options; |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 292 | |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 293 | // On an incomplete decode, the subclass will specify the number of scanlines that it decoded |
| 294 | // successfully. |
| 295 | int rowsDecoded = 0; |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 296 | const Result result = this->onGetPixels(info, pixels, rowBytes, *options, &rowsDecoded); |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 297 | |
| 298 | // A return value of kIncompleteInput indicates a truncated image stream. |
| 299 | // In this case, we will fill any uninitialized memory with a default value. |
| 300 | // Some subclasses will take care of filling any uninitialized memory on |
| 301 | // their own. They indicate that all of the memory has been filled by |
| 302 | // setting rowsDecoded equal to the height. |
Leon Scroggins III | 674a184 | 2017-07-06 12:26:09 -0400 | [diff] [blame] | 303 | if ((kIncompleteInput == result || kErrorInInput == result) && rowsDecoded != info.height()) { |
Leon Scroggins III | 4288657 | 2017-01-27 13:16:28 -0500 | [diff] [blame] | 304 | // FIXME: (skbug.com/5772) fillIncompleteImage will fill using the swizzler's width, unless |
| 305 | // there is a subset. In that case, it will use the width of the subset. From here, the |
| 306 | // subset will only be non-null in the case of SkWebpCodec, but it treats the subset |
| 307 | // differenty from the other codecs, and it needs to use the width specified by the info. |
| 308 | // Set the subset to null so SkWebpCodec uses the correct width. |
| 309 | fOptions.fSubset = nullptr; |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 310 | this->fillIncompleteImage(info, pixels, rowBytes, options->fZeroInitialized, info.height(), |
| 311 | rowsDecoded); |
| 312 | } |
| 313 | |
scroggo | eb602a5 | 2015-07-09 08:16:03 -0700 | [diff] [blame] | 314 | return result; |
| 315 | } |
| 316 | |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 317 | SkCodec::Result SkCodec::startIncrementalDecode(const SkImageInfo& info, void* pixels, |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 318 | size_t rowBytes, const SkCodec::Options* options) { |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 319 | fStartedIncrementalDecode = false; |
| 320 | |
| 321 | if (kUnknown_SkColorType == info.colorType()) { |
| 322 | return kInvalidConversion; |
| 323 | } |
| 324 | if (nullptr == pixels) { |
| 325 | return kInvalidParameters; |
| 326 | } |
| 327 | |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 328 | // FIXME: If the rows come after the rows of a previous incremental decode, |
| 329 | // we might be able to skip the rewind, but only the implementation knows |
| 330 | // that. (e.g. PNG will always need to rewind, since we called longjmp, but |
| 331 | // a bottom-up BMP could skip rewinding if the new rows are above the old |
| 332 | // rows.) |
| 333 | if (!this->rewindIfNeeded()) { |
| 334 | return kCouldNotRewind; |
| 335 | } |
| 336 | |
| 337 | // Set options. |
| 338 | Options optsStorage; |
| 339 | if (nullptr == options) { |
| 340 | options = &optsStorage; |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 341 | } else { |
| 342 | const Result frameIndexResult = this->handleFrameIndex(info, pixels, rowBytes, *options); |
| 343 | if (frameIndexResult != kSuccess) { |
| 344 | return frameIndexResult; |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 345 | } |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 346 | if (options->fSubset) { |
| 347 | SkIRect size = SkIRect::MakeSize(info.dimensions()); |
| 348 | if (!size.contains(*options->fSubset)) { |
| 349 | return kInvalidParameters; |
| 350 | } |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 351 | |
Leon Scroggins III | 1f6af6b | 2017-06-12 16:41:09 -0400 | [diff] [blame] | 352 | const int top = options->fSubset->top(); |
| 353 | const int bottom = options->fSubset->bottom(); |
| 354 | if (top < 0 || top >= info.height() || top >= bottom || bottom > info.height()) { |
| 355 | return kInvalidParameters; |
| 356 | } |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 357 | } |
| 358 | } |
| 359 | |
| 360 | if (!this->dimensionsSupported(info.dimensions())) { |
| 361 | return kInvalidScale; |
| 362 | } |
| 363 | |
| 364 | fDstInfo = info; |
| 365 | fOptions = *options; |
| 366 | |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 367 | const Result result = this->onStartIncrementalDecode(info, pixels, rowBytes, fOptions); |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 368 | if (kSuccess == result) { |
| 369 | fStartedIncrementalDecode = true; |
| 370 | } else if (kUnimplemented == result) { |
| 371 | // FIXME: This is temporarily necessary, until we transition SkCodec |
| 372 | // implementations from scanline decoding to incremental decoding. |
| 373 | // SkAndroidCodec will first attempt to use incremental decoding, but |
| 374 | // will fall back to scanline decoding if incremental returns |
| 375 | // kUnimplemented. rewindIfNeeded(), above, set fNeedsRewind to true |
| 376 | // (after potentially rewinding), but we do not want the next call to |
| 377 | // startScanlineDecode() to do a rewind. |
| 378 | fNeedsRewind = false; |
| 379 | } |
| 380 | return result; |
| 381 | } |
| 382 | |
| 383 | |
| 384 | SkCodec::Result SkCodec::startScanlineDecode(const SkImageInfo& info, |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 385 | const SkCodec::Options* options) { |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 386 | // Reset fCurrScanline in case of failure. |
| 387 | fCurrScanline = -1; |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 388 | |
scroggo | 3a7701c | 2015-09-30 09:15:14 -0700 | [diff] [blame] | 389 | if (!this->rewindIfNeeded()) { |
| 390 | return kCouldNotRewind; |
| 391 | } |
| 392 | |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 393 | // Set options. |
| 394 | Options optsStorage; |
| 395 | if (nullptr == options) { |
| 396 | options = &optsStorage; |
scroggo | e7fc14b | 2015-10-02 13:14:46 -0700 | [diff] [blame] | 397 | } else if (options->fSubset) { |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 398 | SkIRect size = SkIRect::MakeSize(info.dimensions()); |
msarett | fdb4757 | 2015-10-13 12:50:14 -0700 | [diff] [blame] | 399 | if (!size.contains(*options->fSubset)) { |
| 400 | return kInvalidInput; |
| 401 | } |
| 402 | |
| 403 | // We only support subsetting in the x-dimension for scanline decoder. |
| 404 | // Subsetting in the y-dimension can be accomplished using skipScanlines(). |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 405 | if (options->fSubset->top() != 0 || options->fSubset->height() != info.height()) { |
msarett | fdb4757 | 2015-10-13 12:50:14 -0700 | [diff] [blame] | 406 | return kInvalidInput; |
scroggo | e7fc14b | 2015-10-02 13:14:46 -0700 | [diff] [blame] | 407 | } |
| 408 | } |
| 409 | |
| 410 | // FIXME: Support subsets somehow? |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 411 | if (!this->dimensionsSupported(info.dimensions())) { |
scroggo | e7fc14b | 2015-10-02 13:14:46 -0700 | [diff] [blame] | 412 | return kInvalidScale; |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 413 | } |
| 414 | |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 415 | const Result result = this->onStartScanlineDecode(info, *options); |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 416 | if (result != SkCodec::kSuccess) { |
| 417 | return result; |
| 418 | } |
| 419 | |
| 420 | fCurrScanline = 0; |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 421 | fDstInfo = info; |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 422 | fOptions = *options; |
| 423 | return kSuccess; |
| 424 | } |
| 425 | |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 426 | int SkCodec::getScanlines(void* dst, int countLines, size_t rowBytes) { |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 427 | if (fCurrScanline < 0) { |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 428 | return 0; |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 429 | } |
| 430 | |
| 431 | SkASSERT(!fDstInfo.isEmpty()); |
scroggo | e7fc14b | 2015-10-02 13:14:46 -0700 | [diff] [blame] | 432 | if (countLines <= 0 || fCurrScanline + countLines > fDstInfo.height()) { |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 433 | return 0; |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 434 | } |
| 435 | |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 436 | const int linesDecoded = this->onGetScanlines(dst, countLines, rowBytes); |
| 437 | if (linesDecoded < countLines) { |
| 438 | this->fillIncompleteImage(this->dstInfo(), dst, rowBytes, this->options().fZeroInitialized, |
| 439 | countLines, linesDecoded); |
| 440 | } |
| 441 | fCurrScanline += countLines; |
| 442 | return linesDecoded; |
| 443 | } |
| 444 | |
| 445 | bool SkCodec::skipScanlines(int countLines) { |
| 446 | if (fCurrScanline < 0) { |
| 447 | return false; |
| 448 | } |
| 449 | |
| 450 | SkASSERT(!fDstInfo.isEmpty()); |
| 451 | if (countLines < 0 || fCurrScanline + countLines > fDstInfo.height()) { |
| 452 | // Arguably, we could just skip the scanlines which are remaining, |
| 453 | // and return true. We choose to return false so the client |
| 454 | // can catch their bug. |
| 455 | return false; |
| 456 | } |
| 457 | |
| 458 | bool result = this->onSkipScanlines(countLines); |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 459 | fCurrScanline += countLines; |
| 460 | return result; |
| 461 | } |
| 462 | |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 463 | int SkCodec::outputScanline(int inputScanline) const { |
| 464 | SkASSERT(0 <= inputScanline && inputScanline < this->getInfo().height()); |
| 465 | return this->onOutputScanline(inputScanline); |
| 466 | } |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 467 | |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 468 | int SkCodec::onOutputScanline(int inputScanline) const { |
| 469 | switch (this->getScanlineOrder()) { |
| 470 | case kTopDown_SkScanlineOrder: |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 471 | return inputScanline; |
| 472 | case kBottomUp_SkScanlineOrder: |
| 473 | return this->getInfo().height() - inputScanline - 1; |
| 474 | default: |
| 475 | // This case indicates an interlaced gif and is implemented by SkGifCodec. |
| 476 | SkASSERT(false); |
| 477 | return 0; |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 478 | } |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 479 | } |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 480 | |
msarett | f7eb6fc | 2016-09-13 09:04:11 -0700 | [diff] [blame] | 481 | uint64_t SkCodec::onGetFillValue(const SkImageInfo& dstInfo) const { |
| 482 | switch (dstInfo.colorType()) { |
| 483 | case kRGBA_F16_SkColorType: { |
| 484 | static constexpr uint64_t transparentColor = 0; |
| 485 | static constexpr uint64_t opaqueColor = ((uint64_t) SK_Half1) << 48; |
| 486 | return (kOpaque_SkAlphaType == fSrcInfo.alphaType()) ? opaqueColor : transparentColor; |
| 487 | } |
| 488 | default: { |
Leon Scroggins | 571b30f | 2017-07-11 17:35:31 +0000 | [diff] [blame] | 489 | // This not only handles the kN32 case, but also k565, kGray8, since |
msarett | f7eb6fc | 2016-09-13 09:04:11 -0700 | [diff] [blame] | 490 | // the low bits are zeros. |
| 491 | return (kOpaque_SkAlphaType == fSrcInfo.alphaType()) ? |
| 492 | SK_ColorBLACK : SK_ColorTRANSPARENT; |
| 493 | } |
| 494 | } |
| 495 | } |
| 496 | |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 497 | static void fill_proc(const SkImageInfo& info, void* dst, size_t rowBytes, |
msarett | f7eb6fc | 2016-09-13 09:04:11 -0700 | [diff] [blame] | 498 | uint64_t colorOrIndex, SkCodec::ZeroInitialized zeroInit, SkSampler* sampler) { |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 499 | if (sampler) { |
| 500 | sampler->fill(info, dst, rowBytes, colorOrIndex, zeroInit); |
| 501 | } else { |
| 502 | SkSampler::Fill(info, dst, rowBytes, colorOrIndex, zeroInit); |
| 503 | } |
| 504 | } |
| 505 | |
| 506 | void SkCodec::fillIncompleteImage(const SkImageInfo& info, void* dst, size_t rowBytes, |
| 507 | ZeroInitialized zeroInit, int linesRequested, int linesDecoded) { |
| 508 | |
| 509 | void* fillDst; |
msarett | f7eb6fc | 2016-09-13 09:04:11 -0700 | [diff] [blame] | 510 | const uint64_t fillValue = this->getFillValue(info); |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 511 | const int linesRemaining = linesRequested - linesDecoded; |
| 512 | SkSampler* sampler = this->getSampler(false); |
| 513 | |
msarett | 91c22b2 | 2016-02-22 12:27:46 -0800 | [diff] [blame] | 514 | int fillWidth = info.width(); |
| 515 | if (fOptions.fSubset) { |
| 516 | fillWidth = fOptions.fSubset->width(); |
| 517 | } |
| 518 | |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 519 | switch (this->getScanlineOrder()) { |
scroggo | 8e6c7ad | 2016-09-16 08:20:38 -0700 | [diff] [blame] | 520 | case kTopDown_SkScanlineOrder: { |
msarett | 91c22b2 | 2016-02-22 12:27:46 -0800 | [diff] [blame] | 521 | const SkImageInfo fillInfo = info.makeWH(fillWidth, linesRemaining); |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 522 | fillDst = SkTAddOffset<void>(dst, linesDecoded * rowBytes); |
| 523 | fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, sampler); |
| 524 | break; |
| 525 | } |
| 526 | case kBottomUp_SkScanlineOrder: { |
| 527 | fillDst = dst; |
msarett | 91c22b2 | 2016-02-22 12:27:46 -0800 | [diff] [blame] | 528 | const SkImageInfo fillInfo = info.makeWH(fillWidth, linesRemaining); |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 529 | fill_proc(fillInfo, fillDst, rowBytes, fillValue, zeroInit, sampler); |
| 530 | break; |
| 531 | } |
msarett | e6dd004 | 2015-10-09 11:07:34 -0700 | [diff] [blame] | 532 | } |
scroggo | 46c5747 | 2015-09-30 08:57:13 -0700 | [diff] [blame] | 533 | } |
Matt Sarett | 313c463 | 2016-10-20 12:35:23 -0400 | [diff] [blame] | 534 | |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 535 | static inline SkColorSpaceXform::ColorFormat select_xform_format_ct(SkColorType colorType) { |
| 536 | switch (colorType) { |
| 537 | case kRGBA_8888_SkColorType: |
| 538 | return SkColorSpaceXform::kRGBA_8888_ColorFormat; |
| 539 | case kBGRA_8888_SkColorType: |
| 540 | return SkColorSpaceXform::kBGRA_8888_ColorFormat; |
| 541 | case kRGB_565_SkColorType: |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 542 | #ifdef SK_PMCOLOR_IS_RGBA |
| 543 | return SkColorSpaceXform::kRGBA_8888_ColorFormat; |
| 544 | #else |
| 545 | return SkColorSpaceXform::kBGRA_8888_ColorFormat; |
| 546 | #endif |
| 547 | default: |
| 548 | SkASSERT(false); |
| 549 | return SkColorSpaceXform::kRGBA_8888_ColorFormat; |
| 550 | } |
| 551 | } |
| 552 | |
Matt Sarett | cf3f234 | 2017-03-23 15:32:25 -0400 | [diff] [blame] | 553 | bool SkCodec::initializeColorXform(const SkImageInfo& dstInfo, |
| 554 | SkTransferFunctionBehavior premulBehavior) { |
Matt Sarett | 313c463 | 2016-10-20 12:35:23 -0400 | [diff] [blame] | 555 | fColorXform = nullptr; |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 556 | fXformOnDecode = false; |
Matt Sarett | cf3f234 | 2017-03-23 15:32:25 -0400 | [diff] [blame] | 557 | bool needsColorCorrectPremul = needs_premul(dstInfo, fEncodedInfo) && |
| 558 | SkTransferFunctionBehavior::kRespect == premulBehavior; |
| 559 | if (needs_color_xform(dstInfo, fSrcInfo, needsColorCorrectPremul)) { |
| 560 | fColorXform = SkColorSpaceXform_Base::New(fSrcInfo.colorSpace(), dstInfo.colorSpace(), |
| 561 | premulBehavior); |
Matt Sarett | 313c463 | 2016-10-20 12:35:23 -0400 | [diff] [blame] | 562 | if (!fColorXform) { |
| 563 | return false; |
| 564 | } |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 565 | |
| 566 | // We will apply the color xform when reading the color table unless F16 is requested. |
| 567 | fXformOnDecode = SkEncodedInfo::kPalette_Color != fEncodedInfo.color() |
| 568 | || kRGBA_F16_SkColorType == dstInfo.colorType(); |
| 569 | if (fXformOnDecode) { |
| 570 | fDstXformFormat = select_xform_format(dstInfo.colorType()); |
| 571 | } else { |
| 572 | fDstXformFormat = select_xform_format_ct(dstInfo.colorType()); |
| 573 | } |
Matt Sarett | 313c463 | 2016-10-20 12:35:23 -0400 | [diff] [blame] | 574 | } |
| 575 | |
| 576 | return true; |
| 577 | } |
Leon Scroggins III | e132e7b | 2017-04-12 10:49:52 -0400 | [diff] [blame] | 578 | |
Leon Scroggins III | c6e6a5f | 2017-06-05 15:53:38 -0400 | [diff] [blame] | 579 | void SkCodec::applyColorXform(void* dst, const void* src, int count, SkAlphaType at) const { |
| 580 | SkASSERT(fColorXform); |
| 581 | SkAssertResult(fColorXform->apply(fDstXformFormat, dst, |
| 582 | fSrcXformFormat, src, |
| 583 | count, at)); |
| 584 | } |
| 585 | |
| 586 | void SkCodec::applyColorXform(void* dst, const void* src, int count) const { |
| 587 | auto alphaType = select_xform_alpha(fDstInfo.alphaType(), fSrcInfo.alphaType()); |
| 588 | this->applyColorXform(dst, src, count, alphaType); |
| 589 | } |
| 590 | |
Leon Scroggins III | e132e7b | 2017-04-12 10:49:52 -0400 | [diff] [blame] | 591 | std::vector<SkCodec::FrameInfo> SkCodec::getFrameInfo() { |
Leon Scroggins III | 249b8e3 | 2017-04-17 12:46:33 -0400 | [diff] [blame] | 592 | const int frameCount = this->getFrameCount(); |
| 593 | SkASSERT(frameCount >= 0); |
| 594 | if (frameCount <= 0) { |
| 595 | return std::vector<FrameInfo>{}; |
Leon Scroggins III | e132e7b | 2017-04-12 10:49:52 -0400 | [diff] [blame] | 596 | } |
Leon Scroggins III | 249b8e3 | 2017-04-17 12:46:33 -0400 | [diff] [blame] | 597 | |
| 598 | if (frameCount == 1 && !this->onGetFrameInfo(0, nullptr)) { |
| 599 | // Not animated. |
| 600 | return std::vector<FrameInfo>{}; |
| 601 | } |
| 602 | |
| 603 | std::vector<FrameInfo> result(frameCount); |
| 604 | for (int i = 0; i < frameCount; ++i) { |
| 605 | SkAssertResult(this->onGetFrameInfo(i, &result[i])); |
| 606 | } |
| 607 | return result; |
Leon Scroggins III | e132e7b | 2017-04-12 10:49:52 -0400 | [diff] [blame] | 608 | } |