aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-06-28 05:43:28 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-28 05:43:28 -0700
commit0a8f40cbe693274d8f63ac423e51be3e75ce5d35 (patch)
tree11a473ef09e6f86bf1945a6845a655fc36c87a20 /include/core
parent7070a3c44b24da5715dc4da618cb014f87e92451 (diff)
remove SK_SUPPORT_LEGACY_COLORPROFILETYPE dead-code
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkBitmap.h3
-rw-r--r--include/core/SkImageInfo.h44
2 files changed, 0 insertions, 47 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 8b499097e9..5406f94328 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -86,9 +86,6 @@ public:
SkColorType colorType() const { return fInfo.colorType(); }
SkAlphaType alphaType() const { return fInfo.alphaType(); }
SkColorSpace* colorSpace() const { return fInfo.colorSpace(); }
-#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
- SkColorProfileType profileType() const { return fInfo.profileType(); }
-#endif
/**
* Return the number of bytes per pixel based on the colortype. If the colortype is
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index b45ee38ee1..f143503c66 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -169,15 +169,6 @@ enum SkYUVColorSpace {
///////////////////////////////////////////////////////////////////////////////
-#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
-enum SkColorProfileType {
- kLinear_SkColorProfileType,
- kSRGB_SkColorProfileType,
-
- kLastEnum_SkColorProfileType = kSRGB_SkColorProfileType
-};
-#endif
-
enum class SkSourceGammaTreatment {
kRespect,
kIgnore,
@@ -238,41 +229,6 @@ public:
return MakeUnknown(0, 0);
}
-#ifdef SK_SUPPORT_LEGACY_COLORPROFILETYPE
- static SkImageInfo Make(int width, int height, SkColorType ct, SkAlphaType at,
- SkColorProfileType pt) {
- sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
- SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
- return Make(width, height, ct, at, cs);
- }
-
- static SkImageInfo MakeN32(int width, int height, SkAlphaType at, SkColorProfileType pt) {
- sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
- SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
- return SkImageInfo(width, height, kN32_SkColorType, at, cs);
- }
-
- /**
- * Sets colortype to the native ARGB32 type, and the alphatype to premul.
- */
- static SkImageInfo MakeN32Premul(int width, int height, SkColorProfileType pt) {
- sk_sp<SkColorSpace> cs = (kSRGB_SkColorProfileType == pt) ?
- SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named) : nullptr;
- return Make(width, height, kN32_SkColorType, kPremul_SkAlphaType, cs);
- }
-
- /**
- * Sets colortype to the native ARGB32 type, and the alphatype to premul.
- */
- static SkImageInfo MakeN32Premul(const SkISize& size, SkColorProfileType pt) {
- return MakeN32Premul(size.width(), size.height(), pt);
- }
-
- SkColorProfileType profileType() const;
- bool isLinear() const { return kLinear_SkColorProfileType == this->profileType(); }
- bool isSRGB() const { return kSRGB_SkColorProfileType == this->profileType(); }
-#endif
-
int width() const { return fWidth; }
int height() const { return fHeight; }
SkColorType colorType() const { return fColorType; }