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

Side by Side Diff: include/codec/SkEncodedInfo.h

Issue 2170793004: Remove unnecessary getColorSpace() API from SkCodec (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Pass refs more efficiently Created 4 years, 5 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 | « include/codec/SkCodec.h ('k') | src/codec/SkCodec.cpp » ('j') | 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 2016 Google Inc. 2 * Copyright 2016 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 #ifndef SkEncodedInfo_DEFINED 8 #ifndef SkEncodedInfo_DEFINED
9 #define SkEncodedInfo_DEFINED 9 #define SkEncodedInfo_DEFINED
10 10
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 break; 110 break;
111 } 111 }
112 112
113 return SkEncodedInfo(color, alpha, bitsPerComponent); 113 return SkEncodedInfo(color, alpha, bitsPerComponent);
114 } 114 }
115 115
116 /* 116 /*
117 * Returns an SkImageInfo with Skia color and alpha types that are the 117 * Returns an SkImageInfo with Skia color and alpha types that are the
118 * closest possible match to the encoded info. 118 * closest possible match to the encoded info.
119 */ 119 */
120 SkImageInfo makeImageInfo(int width, int height, const sk_sp<SkColorSpace>& colorSpace) const { 120 SkImageInfo makeImageInfo(int width, int height, sk_sp<SkColorSpace> colorSp ace) const {
121 switch (fColor) { 121 switch (fColor) {
122 case kGray_Color: 122 case kGray_Color:
123 SkASSERT(kOpaque_Alpha == fAlpha); 123 SkASSERT(kOpaque_Alpha == fAlpha);
124 return SkImageInfo::Make(width, height, kGray_8_SkColorType, 124 return SkImageInfo::Make(width, height, kGray_8_SkColorType,
125 kOpaque_SkAlphaType, colorSpace); 125 kOpaque_SkAlphaType, colorSpace);
126 case kGrayAlpha_Color: 126 case kGrayAlpha_Color:
127 SkASSERT(kOpaque_Alpha != fAlpha); 127 SkASSERT(kOpaque_Alpha != fAlpha);
128 return SkImageInfo::Make(width, height, kN32_SkColorType, 128 return SkImageInfo::Make(width, height, kN32_SkColorType,
129 kUnpremul_SkAlphaType, colorSpace); 129 kUnpremul_SkAlphaType, colorSpace);
130 case kPalette_Color: { 130 case kPalette_Color: {
131 SkAlphaType alphaType = (kOpaque_Alpha == fAlpha) ? kOpaque_SkAl phaType : 131 SkAlphaType alphaType = (kOpaque_Alpha == fAlpha) ? kOpaque_SkAl phaType :
132 kUnpremul_SkAlphaType; 132 kUnpremul_SkAlphaType;
133 return SkImageInfo::Make(width, height, kIndex_8_SkColorType, 133 return SkImageInfo::Make(width, height, kIndex_8_SkColorType,
134 alphaType, colorSpace); 134 alphaType, colorSpace);
135 } 135 }
136 case kRGB_Color: 136 case kRGB_Color:
137 case kBGR_Color: 137 case kBGR_Color:
138 case kBGRX_Color: 138 case kBGRX_Color:
139 case kYUV_Color: 139 case kYUV_Color:
140 case kInvertedCMYK_Color: 140 case kInvertedCMYK_Color:
141 case kYCCK_Color: 141 case kYCCK_Color:
142 SkASSERT(kOpaque_Alpha == fAlpha); 142 SkASSERT(kOpaque_Alpha == fAlpha);
143 return SkImageInfo::Make(width, height, kN32_SkColorType, 143 return SkImageInfo::Make(width, height, kN32_SkColorType,
144 kOpaque_SkAlphaType, colorSpace); 144 kOpaque_SkAlphaType, colorSpace);
145 case kRGBA_Color: 145 case kRGBA_Color:
146 case kBGRA_Color: 146 case kBGRA_Color:
147 case kYUVA_Color: 147 case kYUVA_Color:
148 SkASSERT(kOpaque_Alpha != fAlpha); 148 SkASSERT(kOpaque_Alpha != fAlpha);
149 return SkImageInfo::Make(width, height, kN32_SkColorType, 149 return SkImageInfo::Make(width, height, kN32_SkColorType,
150 kUnpremul_SkAlphaType, colorSpace); 150 kUnpremul_SkAlphaType, std::move(colorS pace));
151 default: 151 default:
152 SkASSERT(false); 152 SkASSERT(false);
153 return SkImageInfo::MakeUnknown(); 153 return SkImageInfo::MakeUnknown();
154 } 154 }
155 } 155 }
156 156
157 Color color() const { return fColor; } 157 Color color() const { return fColor; }
158 Alpha alpha() const { return fAlpha; } 158 Alpha alpha() const { return fAlpha; }
159 uint8_t bitsPerComponent() const { return fBitsPerComponent; } 159 uint8_t bitsPerComponent() const { return fBitsPerComponent; }
160 160
(...skipping 29 matching lines...) Expand all
190 , fAlpha(alpha) 190 , fAlpha(alpha)
191 , fBitsPerComponent(bitsPerComponent) 191 , fBitsPerComponent(bitsPerComponent)
192 {} 192 {}
193 193
194 Color fColor; 194 Color fColor;
195 Alpha fAlpha; 195 Alpha fAlpha;
196 uint8_t fBitsPerComponent; 196 uint8_t fBitsPerComponent;
197 }; 197 };
198 198
199 #endif 199 #endif
OLDNEW
« no previous file with comments | « include/codec/SkCodec.h ('k') | src/codec/SkCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698