diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-07-25 13:05:17 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-25 23:51:15 +0000 |
| commit | e28a6b55dfbcd510d86cca39a167d179b81e4f4c (patch) | |
| tree | 7d9151d55b67f749fd701b7c8fe52b6f922988d3 /src/core/SkPM4fPriv.h | |
| parent | 68300c270916b2740fccdbe6c6dce8f085e83316 (diff) | |
add explicit accessor for sRGB singleton colorspaces
SkColorSpace::MakeSRGB().get() is scary, and causes more ref/unref
pairs than strictly necessary for these singletons.
This time the implementation is still in SkColorSpace.cpp,
so these should really work as singletons.
Change-Id: I40f2942c8dcde3040663a04c4f5330aca90868ae
Reviewed-on: https://skia-review.googlesource.com/143305
Auto-Submit: Mike Klein <mtklein@chromium.org>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/core/SkPM4fPriv.h')
| -rw-r--r-- | src/core/SkPM4fPriv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/SkPM4fPriv.h b/src/core/SkPM4fPriv.h index f5e9aa02e6..f7daabf7dc 100644 --- a/src/core/SkPM4fPriv.h +++ b/src/core/SkPM4fPriv.h @@ -10,6 +10,7 @@ #include "SkColorData.h" #include "SkColorSpace.h" +#include "SkColorSpacePriv.h" #include "SkColorSpaceXformSteps.h" #include "SkArenaAlloc.h" #include "SkPM4f.h" @@ -40,7 +41,7 @@ static inline uint32_t Sk4f_toL32(const Sk4f& px) { static inline SkPM4f premul_in_dst_colorspace(SkColor4f color4f, SkColorSpace* srcCS, SkColorSpace* dstCS) { // We treat untagged sources as sRGB. - if (!srcCS) { srcCS = SkColorSpace::MakeSRGB().get(); } + if (!srcCS) { srcCS = sk_srgb_singleton(); } // If dstCS is null, no color space transformation is needed (and apply() will just premul). if (!dstCS) { dstCS = srcCS; } @@ -58,7 +59,7 @@ static inline SkPM4f premul_in_dst_colorspace(SkColor c, SkColorSpace* dstCS) { swizzle_rb(Sk4f_fromL32(c)).store(color4f.vec()); // SkColors are always sRGB. - return premul_in_dst_colorspace(color4f, SkColorSpace::MakeSRGB().get(), dstCS); + return premul_in_dst_colorspace(color4f, sk_srgb_singleton(), dstCS); } // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! |