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

Side by Side Diff: src/codec/SkCodec.cpp

Issue 1254483004: Scanline decoding for wbmp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: More minor fixes Created 5 years, 4 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 "SkBmpCodec.h" 8 #include "SkBmpCodec.h"
9 #include "SkCodec.h" 9 #include "SkCodec.h"
10 #include "SkData.h" 10 #include "SkData.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 126 }
127 const Result result = this->onGetPixels(info, pixels, rowBytes, *options, ct able, ctableCount); 127 const Result result = this->onGetPixels(info, pixels, rowBytes, *options, ct able, ctableCount);
128 128
129 if ((kIncompleteInput == result || kSuccess == result) && ctableCount) { 129 if ((kIncompleteInput == result || kSuccess == result) && ctableCount) {
130 SkASSERT(*ctableCount >= 0 && *ctableCount <= 256); 130 SkASSERT(*ctableCount >= 0 && *ctableCount <= 256);
131 } 131 }
132 return result; 132 return result;
133 } 133 }
134 134
135 SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) { 135 SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
136 SkASSERT(kIndex_8_SkColorType != info.colorType());
137 if (kIndex_8_SkColorType == info.colorType()) {
138 return kInvalidConversion;
139 }
140 return this->getPixels(info, pixels, rowBytes, NULL, NULL, NULL); 136 return this->getPixels(info, pixels, rowBytes, NULL, NULL, NULL);
141 } 137 }
142
OLDNEW
« no previous file with comments | « resources/index8.png ('k') | src/codec/SkCodecPriv.h » ('j') | src/codec/SkCodec_wbmp.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698