SkColorSpace follow-ups
Based on comments from:
https://codereview.chromium.org/1985903002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1986833002
Review-Url: https://codereview.chromium.org/1986833002
diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp
index 28b3e8b..59013fe 100644
--- a/src/core/SkColorSpace.cpp
+++ b/src/core/SkColorSpace.cpp
@@ -554,7 +554,7 @@
return true;
}
-bool SkColorSpace::LoadA2B0(SkColorLookUpTable* colorLUT, sk_sp<SkGammas> gammas, SkMatrix44* toXYZ,
+bool SkColorSpace::LoadA2B0(SkColorLookUpTable* colorLUT, SkGammaCurve* gammas, SkMatrix44* toXYZ,
const uint8_t* src, size_t len) {
if (len < 32) {
SkColorSpacePrintf("A to B tag is too small (%d bytes).", len);
@@ -604,7 +604,7 @@
uint32_t offsetToMCurves = read_big_endian_int(src + 20);
if (0 != offsetToMCurves && offsetToMCurves < len) {
- if (!SkColorSpace::LoadGammas(&gammas->fRed, outputChannels, src + offsetToMCurves,
+ if (!SkColorSpace::LoadGammas(gammas, outputChannels, src + offsetToMCurves,
len - offsetToMCurves)) {
SkColorSpacePrintf("Failed to read M curves from A to B tag.\n");
}
@@ -680,23 +680,25 @@
// It is not uncommon to see missing or empty gamma tags. This indicates
// that we should use unit gamma.
- sk_sp<SkGammas> gammas(new SkGammas());
+ SkGammaCurve curves[3];
r = ICCTag::Find(tags.get(), tagCount, kTAG_rTRC);
g = ICCTag::Find(tags.get(), tagCount, kTAG_gTRC);
b = ICCTag::Find(tags.get(), tagCount, kTAG_bTRC);
- if (!r || !SkColorSpace::LoadGammas(&gammas->fRed, 1,
+ if (!r || !SkColorSpace::LoadGammas(&curves[0], 1,
r->addr((const uint8_t*) base), r->fLength)) {
SkColorSpacePrintf("Failed to read R gamma tag.\n");
}
- if (!g || !SkColorSpace::LoadGammas(&gammas->fGreen, 1,
+ if (!g || !SkColorSpace::LoadGammas(&curves[1], 1,
g->addr((const uint8_t*) base), g->fLength)) {
SkColorSpacePrintf("Failed to read G gamma tag.\n");
}
- if (!b || !SkColorSpace::LoadGammas(&gammas->fBlue, 1,
+ if (!b || !SkColorSpace::LoadGammas(&curves[2], 1,
b->addr((const uint8_t*) base), b->fLength)) {
SkColorSpacePrintf("Failed to read B gamma tag.\n");
}
+ sk_sp<SkGammas> gammas(new SkGammas(std::move(curves[0]), std::move(curves[1]),
+ std::move(curves[2])));
SkMatrix44 mat(SkMatrix44::kUninitialized_Constructor);
mat.set3x3ColMajorf(toXYZ);
if (gammas->isValues()) {
@@ -716,13 +718,15 @@
const ICCTag* a2b0 = ICCTag::Find(tags.get(), tagCount, kTAG_A2B0);
if (a2b0) {
SkAutoTDelete<SkColorLookUpTable> colorLUT(new SkColorLookUpTable());
- sk_sp<SkGammas> gammas(new SkGammas());
+ SkGammaCurve curves[3];
SkMatrix44 toXYZ(SkMatrix44::kUninitialized_Constructor);
- if (!SkColorSpace::LoadA2B0(colorLUT, gammas, &toXYZ,
+ if (!SkColorSpace::LoadA2B0(colorLUT, curves, &toXYZ,
a2b0->addr((const uint8_t*) base), a2b0->fLength)) {
return_null("Failed to parse A2B0 tag");
}
+ sk_sp<SkGammas> gammas(new SkGammas(std::move(curves[0]), std::move(curves[1]),
+ std::move(curves[2])));
if (colorLUT->fTable) {
return sk_sp<SkColorSpace>(new SkColorSpace(colorLUT.release(), gammas, toXYZ));
} else if (gammas->isValues()) {
diff --git a/src/core/SkColorSpace.h b/src/core/SkColorSpace.h
index ccbaa25..299ffbc 100644
--- a/src/core/SkColorSpace.h
+++ b/src/core/SkColorSpace.h
@@ -23,7 +23,7 @@
#include "SkMatrix44.h"
#include "SkRefCnt.h"
-#include "SkTemplates.h"
+#include "../private/SkTemplates.h"
struct SkColorLookUpTable;
struct SkGammaCurve;
@@ -46,7 +46,11 @@
static sk_sp<SkColorSpace> NewNamed(Named);
static sk_sp<SkColorSpace> NewICC(const void*, size_t);
+ /**
+ * Used only by test code.
+ */
SkGammas* gammas() const { return fGammas.get(); }
+
SkMatrix44 xyz() const { return fToXYZD50; }
Named named() const { return fNamed; }
uint32_t uniqueID() const { return fUniqueID; }
@@ -55,12 +59,10 @@
static bool LoadGammas(SkGammaCurve* gammas, uint32_t num, const uint8_t* src, size_t len);
-
static bool LoadColorLUT(SkColorLookUpTable* colorLUT, uint32_t inputChannels,
uint32_t outputChannels, const uint8_t* src, size_t len);
-
- static bool LoadA2B0(SkColorLookUpTable* colorLUT, sk_sp<SkGammas> gammas, SkMatrix44* toXYZ,
+ static bool LoadA2B0(SkColorLookUpTable* colorLUT, SkGammaCurve*, SkMatrix44* toXYZ,
const uint8_t* src, size_t len);
SkColorSpace(sk_sp<SkGammas> gammas, const SkMatrix44& toXYZ, Named);
diff --git a/src/core/SkColorSpacePriv.h b/src/core/SkColorSpacePriv.h
index a07640b..47fab64 100644
--- a/src/core/SkColorSpacePriv.h
+++ b/src/core/SkColorSpacePriv.h
@@ -52,9 +52,9 @@
return fRed.isValue() && fGreen.isValue() && fBlue.isValue();
}
- SkGammaCurve fRed;
- SkGammaCurve fGreen;
- SkGammaCurve fBlue;
+ const SkGammaCurve fRed;
+ const SkGammaCurve fGreen;
+ const SkGammaCurve fBlue;
SkGammas(float red, float green, float blue)
: fRed(red)
@@ -62,6 +62,12 @@
, fBlue(blue)
{}
+ SkGammas(SkGammaCurve red, SkGammaCurve green, SkGammaCurve blue)
+ : fRed(std::move(red))
+ , fGreen(std::move(green))
+ , fBlue(std::move(blue))
+ {}
+
SkGammas() {}
friend class SkColorSpace;