Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c

Issue 534363002: Merge performance fix for cmsDupToneCurve from previous upstream branch. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c b/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c
index d5aa87b105da0f6f6ce5a96966263e8dd0a825fc..97aeb7cc16c2c00698d0529fdb4c08be9555ff42 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c
+++ b/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c
@@ -822,7 +822,7 @@ cmsToneCurve* CMSEXPORT cmsDupToneCurve(const cmsToneCurve* In)
// Xiaochuan Liu
// fix openpdf bug(mantis id:0055683, google id:360198)
// the function CurveSetElemTypeFree in cmslut.c also needs to check pointer
- if (In == NULL || In ->InterpParams == NULL) return NULL;
+ if (In == NULL || In ->InterpParams == NULL || In ->Segments == NULL || In ->Table16 == NULL) return NULL;
jun_fang 2014/09/03 18:52:13 Seems that these the checking for |In ->Segments =
return AllocateToneCurveStruct(In ->InterpParams ->ContextID, In ->nEntries, In ->nSegments, In ->Segments, In ->Table16);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698