summaryrefslogtreecommitdiff
path: root/third_party/lcms2-2.6/src/cmsintrp.c
diff options
context:
space:
mode:
authorkcwu <kcwu@chromium.org>2016-11-07 10:41:52 -0800
committerCommit bot <commit-bot@chromium.org>2016-11-07 10:41:52 -0800
commit413e3518ce390860cb5560720e5fba3ca7c8f764 (patch)
treeab0fba43e66f7b5bb174eb93b959e9c54d20fbb0 /third_party/lcms2-2.6/src/cmsintrp.c
parenteb3f68cc7f25a1e28464eb251161b8f08fcd04bc (diff)
downloadpdfium-413e3518ce390860cb5560720e5fba3ca7c8f764.tar.xz
lcms: backport upstream commit c0a98d86
This fixed several issues. BUG=chromium:654265,chromium:657282,chromium:654676,chromium:654313 Review-Url: https://codereview.chromium.org/2482523003
Diffstat (limited to 'third_party/lcms2-2.6/src/cmsintrp.c')
-rw-r--r--third_party/lcms2-2.6/src/cmsintrp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/lcms2-2.6/src/cmsintrp.c b/third_party/lcms2-2.6/src/cmsintrp.c
index 5d5f35d3fc..14c68563ca 100644
--- a/third_party/lcms2-2.6/src/cmsintrp.c
+++ b/third_party/lcms2-2.6/src/cmsintrp.c
@@ -215,7 +215,7 @@ void LinLerp1D(register const cmsUInt16Number Value[],
// To prevent out of bounds indexing
cmsINLINE cmsFloat32Number fclamp(cmsFloat32Number v)
{
- return v < 0.0f ? 0.0f : (v > 1.0f ? 1.0f : v);
+ return ((v < 0.0f) || isnan(v)) ? 0.0f : (v > 1.0f ? 1.0f : v);
}
// Floating-point version of 1D interpolation