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

Side by Side Diff: include/core/SkColorSpace.h

Issue 2319293002: Rename SkColorSpace::GammaNamed to SkColorSpace::RenderTargetGamma (Closed)
Patch Set: Keep compatible with Chrome Created 4 years, 3 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 | « gm/gamut.cpp ('k') | src/codec/SkPngCodec.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 SkColorSpace_DEFINED 8 #ifndef SkColorSpace_DEFINED
9 #define SkColorSpace_DEFINED 9 #define SkColorSpace_DEFINED
10 10
(...skipping 15 matching lines...) Expand all
26 */ 26 */
27 kSRGB_Named, 27 kSRGB_Named,
28 28
29 /** 29 /**
30 * Very common wide gamut color space. 30 * Very common wide gamut color space.
31 * Often used by images and monitors. 31 * Often used by images and monitors.
32 */ 32 */
33 kAdobeRGB_Named, 33 kAdobeRGB_Named,
34 }; 34 };
35 35
36 enum GammaNamed : uint8_t { 36 enum RenderTargetGamma : uint8_t {
37 kLinear_GammaNamed, 37 kLinear_RenderTargetGamma,
38 38
39 /** 39 /**
40 * Transfer function is the canonical sRGB curve, which has a short lin ear segment 40 * Transfer function is the canonical sRGB curve, which has a short lin ear segment
41 * followed by a 2.4f exponential. 41 * followed by a 2.4f exponential.
42 */ 42 */
43 kSRGB_GammaNamed, 43 kSRGB_RenderTargetGamma,
44
45 // DO NOT USE: Being deleted.
46 kLinear_GammaNamed = kLinear_RenderTargetGamma,
44 }; 47 };
45 48
46 /** 49 /**
47 * Create an SkColorSpace from the src gamma and a transform from src gamut to D50 XYZ. 50 * Create an SkColorSpace from a transfer function and a color gamut transf orm to D50 XYZ.
48 */ 51 */
49 static sk_sp<SkColorSpace> NewRGB(GammaNamed gammaNamed, const SkMatrix44& t oXYZD50); 52 static sk_sp<SkColorSpace> NewRGB(RenderTargetGamma gamma, const SkMatrix44& toXYZD50);
50 53
51 /** 54 /**
52 * Create a common, named SkColorSpace. 55 * Create a common, named SkColorSpace.
53 */ 56 */
54 static sk_sp<SkColorSpace> NewNamed(Named); 57 static sk_sp<SkColorSpace> NewNamed(Named);
55 58
56 /** 59 /**
57 * Create an SkColorSpace from an ICC profile. 60 * Create an SkColorSpace from an ICC profile.
58 */ 61 */
59 static sk_sp<SkColorSpace> NewICC(const void*, size_t); 62 static sk_sp<SkColorSpace> NewICC(const void*, size_t);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 */ 101 */
99 static bool Equals(const SkColorSpace* src, const SkColorSpace* dst); 102 static bool Equals(const SkColorSpace* src, const SkColorSpace* dst);
100 103
101 protected: 104 protected:
102 SkColorSpace(const SkMatrix44& toXYZD50); 105 SkColorSpace(const SkMatrix44& toXYZD50);
103 106
104 const SkMatrix44 fToXYZD50; 107 const SkMatrix44 fToXYZD50;
105 }; 108 };
106 109
107 #endif 110 #endif
OLDNEW
« no previous file with comments | « gm/gamut.cpp ('k') | src/codec/SkPngCodec.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698