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

Side by Side Diff: src/core/SkImageGenerator.cpp

Issue 921293002: Fix conversion from enum to bool error. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 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 "SkImageGenerator.h" 8 #include "SkImageGenerator.h"
9 9
10 bool SkImageGenerator::getInfo(SkImageInfo* info) { 10 bool SkImageGenerator::getInfo(SkImageInfo* info) {
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return NULL; 115 return NULL;
116 } 116 }
117 117
118 bool SkImageGenerator::onGetInfo(SkImageInfo*) { 118 bool SkImageGenerator::onGetInfo(SkImageInfo*) {
119 return false; 119 return false;
120 } 120 }
121 121
122 #ifdef SK_SUPPORT_LEGACY_IMAGE_GENERATOR_RETURN 122 #ifdef SK_SUPPORT_LEGACY_IMAGE_GENERATOR_RETURN
123 bool SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t, 123 bool SkImageGenerator::onGetPixels(const SkImageInfo&, void*, size_t,
124 SkPMColor*, int*) { 124 SkPMColor*, int*) {
125 return kUnimplemented; 125 return false;
126 } 126 }
127 #endif 127 #endif
128 SkImageGenerator::Result SkImageGenerator::onGetPixelsEnum(const SkImageInfo& in fo, void* pixels, 128 SkImageGenerator::Result SkImageGenerator::onGetPixelsEnum(const SkImageInfo& in fo, void* pixels,
129 size_t rowBytes, SkPM Color* colors, 129 size_t rowBytes, SkPM Color* colors,
130 int* colorCount) { 130 int* colorCount) {
131 #ifdef SK_SUPPORT_LEGACY_IMAGE_GENERATOR_RETURN 131 #ifdef SK_SUPPORT_LEGACY_IMAGE_GENERATOR_RETURN
132 if (this->onGetPixels(info, pixels, rowBytes, colors, colorCount)) { 132 if (this->onGetPixels(info, pixels, rowBytes, colors, colorCount)) {
133 return kSuccess; 133 return kSuccess;
134 } 134 }
135 #endif 135 #endif
136 return kUnimplemented; 136 return kUnimplemented;
137 } 137 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698