AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Roll skia/third_party/skcms eb7de4255855..78ef7c5c81fb (1 commits)

Browse Source 
https://skia.googlesource.com/skcms.git/+log/eb7de4255855..78ef7c5c81fb

2018-06-21 brianosman@google.com Treat null profiles as sRGB


The AutoRoll server is located here: https://skcms-skia-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.



CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=kjlubick@google.com

Change-Id: I02d32a027781e2f4b05e0ca93277d374e53550ce
Reviewed-on: https://skia-review.googlesource.com/136544
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
This commit is contained in:
skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com 2018-06-21 16:29:13 +00:00 committed by Skia Commit-Bot
parent 639244261a
commit 94ed719bf8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
third_party/skcms/src/Transform.c vendored
View File

@ -404,9 +404,12 @@ bool skcms_Transform(const void* src,
} }
int n = (int)nz; int n = (int)nz;
// Both profiles can be null if we're just doing format conversion, otherwise both are needed // Null profiles default to sRGB. Passing null for both is handy when doing format conversion.
if (!dstProfile != !srcProfile) { if (!srcProfile) {
return false; srcProfile = skcms_sRGB_profile();
}
if (!dstProfile) {
dstProfile = skcms_sRGB_profile();
} }
// We can't transform in place unless the PixelFormats are the same size. // We can't transform in place unless the PixelFormats are the same size.
@ -442,7 +445,7 @@ bool skcms_Transform(const void* src,
*ops++ = Op_swap_rb; *ops++ = Op_swap_rb;
} }
if (srcProfile && srcProfile->data_color_space == skcms_Signature_CMYK) { if (srcProfile->data_color_space == skcms_Signature_CMYK) {
// Photoshop creates CMYK images as inverse CMYK. // Photoshop creates CMYK images as inverse CMYK.
// These happen to be the only ones we've _ever_ seen. // These happen to be the only ones we've _ever_ seen.
*ops++ = Op_invert; *ops++ = Op_invert;

2
third_party/skcms/version.sha1 vendored
View File

@ -1 +1 @@
eb7de4255855f321ab1ab7a53bc8825c26cbd0e2 78ef7c5c81fb084fa67c7994501c3edd86aef909