diff options
author | Marti Maria <info@littlecms.com> | 2013-04-04 18:07:43 +0200 |
---|---|---|
committer | Marti Maria <info@littlecms.com> | 2013-04-04 18:07:43 +0200 |
commit | cde00fd7dbe74e275aceb4a9055bbb1ae6bf93b2 (patch) | |
tree | f432a84d47d5a48ebb42ceeabc618dfc9ea4d5e5 | |
parent | 570d411a316052fcc84f6bffe3940a01b6c422b7 (diff) | |
download | lcms2-cde00fd7dbe74e275aceb4a9055bbb1ae6bf93b2.tar.gz |
Get rid of dead code
-rw-r--r-- | src/cmsio0.c | 3 | ||||
-rw-r--r-- | src/cmsmd5.c | 2 | ||||
-rw-r--r-- | src/cmsopt.c | 2 | ||||
-rw-r--r-- | src/cmssamp.c | 5 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/cmsio0.c b/src/cmsio0.c index bb77e37..f0a926f 100644 --- a/src/cmsio0.c +++ b/src/cmsio0.c @@ -124,8 +124,7 @@ cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromNULL(cmsContext ContextID) return iohandler; -Error: - if (fm) _cmsFree(ContextID, fm); +Error: if (iohandler) _cmsFree(ContextID, iohandler); return NULL; diff --git a/src/cmsmd5.c b/src/cmsmd5.c index c0fd220..b52c396 100644 --- a/src/cmsmd5.c +++ b/src/cmsmd5.c @@ -309,7 +309,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsHPROFILE hProfile) Error: // Free resources as something went wrong - if (MD5 != NULL) _cmsFree(ContextID, MD5); + // "MD5" cannot be other than NULL here, so no need to free it if (Mem != NULL) _cmsFree(ContextID, Mem); memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); return FALSE; diff --git a/src/cmsopt.c b/src/cmsopt.c index 8a48ce9..e73f57a 100644 --- a/src/cmsopt.c +++ b/src/cmsopt.c @@ -1301,6 +1301,7 @@ cmsBool OptimizeByJoiningCurves(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUI _cmsStageToneCurvesData* Data = (_cmsStageToneCurvesData*) ObtainedCurves ->Data; Curves16Data* c16 = CurvesAlloc(Dest ->ContextID, Data ->nCurves, 256, Data ->TheCurves); + if (c16 == NULL) goto Error; *dwFlags |= cmsFLAGS_NOCACHE; _cmsPipelineSetOptimizationParameters(Dest, FastEvaluateCurves8, c16, CurvesFree, CurvesDup); @@ -1310,6 +1311,7 @@ cmsBool OptimizeByJoiningCurves(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUI _cmsStageToneCurvesData* Data = (_cmsStageToneCurvesData*) cmsStageData(ObtainedCurves); Curves16Data* c16 = CurvesAlloc(Dest ->ContextID, Data ->nCurves, 65536, Data ->TheCurves); + if (c16 == NULL) goto Error; *dwFlags |= cmsFLAGS_NOCACHE; _cmsPipelineSetOptimizationParameters(Dest, FastEvaluateCurves16, c16, CurvesFree, CurvesDup); } diff --git a/src/cmssamp.c b/src/cmssamp.c index b3d1628..1d36be6 100644 --- a/src/cmssamp.c +++ b/src/cmssamp.c @@ -456,7 +456,6 @@ cmsBool CMSEXPORT cmsDetectDestinationBlackPoint(cmsCIEXYZ* BlackPoint, cmsHPROF outRamp[l] = cmsmin(outRamp[l], outRamp[l+1]); } - // Check if (! (outRamp[0] < outRamp[255])) { @@ -471,9 +470,7 @@ cmsBool CMSEXPORT cmsDetectDestinationBlackPoint(cmsCIEXYZ* BlackPoint, cmsHPROF NearlyStraightMidrange = TRUE; MinL = outRamp[0]; MaxL = outRamp[255]; if (Intent == INTENT_RELATIVE_COLORIMETRIC) { - - - + for (l=0; l < 256; l++) { if (! ((inRamp[l] <= MinL + 0.2 * (MaxL - MinL) ) || |