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

Side by Side Diff: dm/DMSrcSink.cpp

Issue 1061713007: Adding png scanline decoding to kIndex8 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: ctableCount requirements Created 5 years, 8 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 "DMSrcSink.h" 8 #include "DMSrcSink.h"
9 #include "SamplePipeControllers.h" 9 #include "SamplePipeControllers.h"
10 #include "SkCommonFlags.h" 10 #include "SkCommonFlags.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 case SkImageGenerator::kIncompleteInput: 132 case SkImageGenerator::kIncompleteInput:
133 break; 133 break;
134 case SkImageGenerator::kInvalidConversion: 134 case SkImageGenerator::kInvalidConversion:
135 return Error::Nonfatal("Incompatible colortype conversion"); 135 return Error::Nonfatal("Incompatible colortype conversion");
136 default: 136 default:
137 // Everything else is considered a failure. 137 // Everything else is considered a failure.
138 return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str( )); 138 return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str( ));
139 } 139 }
140 break; 140 break;
141 case kScanline_Mode: { 141 case kScanline_Mode: {
142 SkScanlineDecoder* scanlineDecoder = codec->getScanlineDecoder(decod eInfo); 142 SkScanlineDecoder* scanlineDecoder = codec->getScanlineDecoder(decod eInfo, NULL,
143 colorPtr, colorCountPtr);
143 if (NULL == scanlineDecoder) { 144 if (NULL == scanlineDecoder) {
144 return Error::Nonfatal("Cannot use scanline decoder for all imag es"); 145 return Error::Nonfatal("Cannot use scanline decoder for all imag es");
145 } 146 }
146 for (int y = 0; y < decodeInfo.height(); ++y) { 147 for (int y = 0; y < decodeInfo.height(); ++y) {
147 const SkImageGenerator::Result result = scanlineDecoder->getScan lines( 148 const SkImageGenerator::Result result = scanlineDecoder->getScan lines(
148 bitmap.getAddr(0, y), 1, 0); 149 bitmap.getAddr(0, y), 1, 0);
149 switch (result) { 150 switch (result) {
150 case SkImageGenerator::kSuccess: 151 case SkImageGenerator::kSuccess:
151 case SkImageGenerator::kIncompleteInput: 152 case SkImageGenerator::kIncompleteInput:
152 break; 153 break;
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 canvas->drawPicture(pic); 720 canvas->drawPicture(pic);
720 return ""; 721 return "";
721 } 722 }
722 SkISize size() const override { return fSrc.size(); } 723 SkISize size() const override { return fSrc.size(); }
723 Name name() const override { sk_throw(); return ""; } // No one should be calling this. 724 Name name() const override { sk_throw(); return ""; } // No one should be calling this.
724 } proxy(src); 725 } proxy(src);
725 return fSink->draw(proxy, bitmap, stream, log); 726 return fSink->draw(proxy, bitmap, stream, log);
726 } 727 }
727 728
728 } // namespace DM 729 } // namespace DM
OLDNEW
« no previous file with comments | « dm/DM.cpp ('k') | include/codec/SkCodec.h » ('j') | include/codec/SkCodec.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698