зеркало из https://github.com/mozilla/gecko-dev.git
Bug 839621 - qcms_transform_create can return null, so indirect callers need to be ready for it as well. r=jmuizelaar
This commit is contained in:
Родитель
48a6cefff5
Коммит
8dbfb840d9
|
@ -1269,7 +1269,9 @@ gfxContext::SetColor(const gfxRGBA& c)
|
|||
if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
|
||||
|
||||
gfxRGBA cms;
|
||||
gfxPlatform::TransformPixel(c, cms, gfxPlatform::GetCMSRGBTransform());
|
||||
qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
|
||||
if (transform)
|
||||
gfxPlatform::TransformPixel(c, cms, transform);
|
||||
|
||||
// Use the original alpha to avoid unnecessary float->byte->float
|
||||
// conversion errors
|
||||
|
@ -1285,7 +1287,9 @@ gfxContext::SetColor(const gfxRGBA& c)
|
|||
if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
|
||||
|
||||
gfxRGBA cms;
|
||||
gfxPlatform::TransformPixel(c, cms, gfxPlatform::GetCMSRGBTransform());
|
||||
qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
|
||||
if (transform)
|
||||
gfxPlatform::TransformPixel(c, cms, transform);
|
||||
|
||||
// Use the original alpha to avoid unnecessary float->byte->float
|
||||
// conversion errors
|
||||
|
|
|
@ -80,7 +80,9 @@ gfxPattern::AddColorStop(gfxFloat offset, const gfxRGBA& c)
|
|||
mStops = NULL;
|
||||
if (gfxPlatform::GetCMSMode() == eCMSMode_All) {
|
||||
gfxRGBA cms;
|
||||
gfxPlatform::TransformPixel(c, cms, gfxPlatform::GetCMSRGBTransform());
|
||||
qcms_transform *transform = gfxPlatform::GetCMSRGBTransform();
|
||||
if (transform)
|
||||
gfxPlatform::TransformPixel(c, cms, transform);
|
||||
|
||||
// Use the original alpha to avoid unnecessary float->byte->float
|
||||
// conversion errors
|
||||
|
@ -431,4 +433,4 @@ gfxPattern::AdjustTransformForPattern(Matrix &aPatternTransform,
|
|||
// device space to current user space.
|
||||
aPatternTransform = aPatternTransform * *aOriginalTransform * mat;
|
||||
aPatternTransform.NudgeToIntegers();
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче