diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | include/lcms2.h | 6 | ||||
-rw-r--r-- | include/lcms2_plugin.h | 4 | ||||
-rw-r--r-- | m4/libtool.m4 | 2 | ||||
-rw-r--r-- | src/cmscgats.c | 2 | ||||
-rw-r--r-- | src/cmserr.c | 4 | ||||
-rw-r--r-- | src/cmsio0.c | 6 | ||||
-rw-r--r-- | src/cmslut.c | 6 | ||||
-rw-r--r-- | src/cmsopt.c | 8 | ||||
-rw-r--r-- | src/cmstypes.c | 8 | ||||
-rw-r--r-- | src/cmswtpnt.c | 2 | ||||
-rw-r--r-- | src/lcms2_internal.h | 4 | ||||
-rw-r--r-- | testbed/testcms2.c | 2 | ||||
-rw-r--r-- | utils/tificc/tificc.c | 2 |
14 files changed, 29 insertions, 29 deletions
@@ -91,7 +91,7 @@ User defined parametric curves can now be saved in ICC profiles. -------------------- Added a check for maximum input channels -Fixed an unitialized read on PatchLUT +Fixed an uninitialized read on PatchLUT Fixed a bug in XYZ floating point PCS added half float variants (ABGR and so) Added formatter resolution after xform optimization plugin diff --git a/include/lcms2.h b/include/lcms2.h index 82bcaed..54f6bfe 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -49,7 +49,7 @@ // #define CMS_USE_CPP_API // Uncomment this line if you need strict CGATS syntax. Makes CGATS files to -// require "KEYWORD" on undefined identifiers, keep it comented out unless needed +// require "KEYWORD" on undefined identifiers, keep it commented out unless needed // #define CMS_STRICT_CGATS 1 // Uncomment to get rid of the tables for "half" float support @@ -1524,7 +1524,7 @@ CMSAPI cmsBool CMSEXPORT cmsCloseIOhandler(cmsIOHANDLER* io); CMSAPI cmsBool CMSEXPORT cmsMD5computeID(cmsHPROFILE hProfile); -// Profile high level funtions ------------------------------------------------------------------------------------------ +// Profile high level functions ------------------------------------------------------------------------------------------ CMSAPI cmsHPROFILE CMSEXPORT cmsOpenProfileFromFile(const char *ICCProfile, const char *sAccess); CMSAPI cmsHPROFILE CMSEXPORT cmsOpenProfileFromFileTHR(cmsContext ContextID, const char *ICCProfile, const char *sAccess); @@ -1640,7 +1640,7 @@ CMSAPI cmsUInt32Number CMSEXPORT cmsGetSupportedIntentsTHR(cmsContext ContextID #define cmsFLAGS_BLACKPOINTCOMPENSATION 0x2000 #define cmsFLAGS_NOWHITEONWHITEFIXUP 0x0004 // Don't fix scum dot #define cmsFLAGS_HIGHRESPRECALC 0x0400 // Use more memory to give better accurancy -#define cmsFLAGS_LOWRESPRECALC 0x0800 // Use less memory to minimize resouces +#define cmsFLAGS_LOWRESPRECALC 0x0800 // Use less memory to minimize resources // For devicelink creation #define cmsFLAGS_8BITS_DEVICELINK 0x0008 // Create 8 bits devicelinks diff --git a/include/lcms2_plugin.h b/include/lcms2_plugin.h index 7eda009..17e480e 100644 --- a/include/lcms2_plugin.h +++ b/include/lcms2_plugin.h @@ -318,7 +318,7 @@ typedef struct { // Parametric curves. A negative type means same function but analytically inverted. Max. number of params is 10 -// Evaluator callback for user-suplied parametric curves. May implement more than one type +// Evaluator callback for user-supplied parametric curves. May implement more than one type typedef cmsFloat64Number (* cmsParametricCurveEvaluator)(cmsInt32Number Type, const cmsFloat64Number Params[10], cmsFloat64Number R); // Plug-in may implement an arbitrary number of parametric curves @@ -428,7 +428,7 @@ typedef struct { cmsUInt32Number nSupportedTypes; // In how many types this tag can come (MAX_TYPES_IN_LCMS_PLUGIN maximum) cmsTagTypeSignature SupportedTypes[MAX_TYPES_IN_LCMS_PLUGIN]; - // For writting + // For writing cmsTagTypeSignature (* DecideType)(cmsFloat64Number ICCVersion, const void *Data); } cmsTagDescriptor; diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 44e0ecf..ae1a3df 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -641,7 +641,7 @@ configured by $[0], generated by m4_PACKAGE_STRING. Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." +gives unlimited permission to copy, distribute and modify it." while test $[#] != 0 do diff --git a/src/cmscgats.c b/src/cmscgats.c index 5fd80c8..04db59e 100644 --- a/src/cmscgats.c +++ b/src/cmscgats.c @@ -623,7 +623,7 @@ cmsFloat64Number ParseFloatNumber(const char *Buffer) if (*Buffer == '.') { cmsFloat64Number frac = 0.0; // fraction - int prec = 0; // precission + int prec = 0; // precision if (*Buffer) Buffer++; diff --git a/src/cmserr.c b/src/cmserr.c index 73e656c..8fb1a9e 100644 --- a/src/cmserr.c +++ b/src/cmserr.c @@ -88,7 +88,7 @@ cmsBool _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plug // ********************************************************************************* // This is the default memory allocation function. It does a very coarse -// check of amout of memory, just to prevent exploits +// check of amount of memory, just to prevent exploits static void* _cmsMallocDefaultFn(cmsContext ContextID, cmsUInt32Number size) { @@ -195,7 +195,7 @@ void _cmsAllocMemPluginChunk(struct _cmsContext_struct* ctx, const struct _cmsCo } else { - // To reset it, we use the default allocators, which cannot be overriden + // To reset it, we use the default allocators, which cannot be overridden ctx ->chunks[MemPlugin] = &ctx ->DefaultMemoryManager; } } diff --git a/src/cmsio0.c b/src/cmsio0.c index 41752f3..eafd41d 100644 --- a/src/cmsio0.c +++ b/src/cmsio0.c @@ -1153,7 +1153,7 @@ cmsHPROFILE CMSEXPORT cmsOpenProfileFromMemTHR(cmsContext ContextID, const void* NewIcc = (_cmsICCPROFILE*) hEmpty; // Ok, in this case const void* is casted to void* just because open IO handler - // shares read and writting modes. Don't abuse this feature! + // shares read and writing modes. Don't abuse this feature! NewIcc ->IOhandler = cmsOpenIOhandlerFromMem(ContextID, (void*) MemPtr, dwSize, "r"); if (NewIcc ->IOhandler == NULL) goto Error; @@ -1443,7 +1443,7 @@ cmsBool CMSEXPORT cmsCloseProfile(cmsHPROFILE hProfile) // Was open in write mode? if (Icc ->IsWrite) { - Icc ->IsWrite = FALSE; // Assure no further writting + Icc ->IsWrite = FALSE; // Assure no further writing rc &= cmsSaveProfileToFile(hProfile, Icc ->IOhandler->PhysicalFile); } @@ -1871,7 +1871,7 @@ Error: } // Similar to the anterior. This function allows to write directly to the ICC profile any data, without -// checking anything. As a rule, mixing Raw with cooked doesn't work, so writting a tag as raw and then reading +// checking anything. As a rule, mixing Raw with cooked doesn't work, so writing a tag as raw and then reading // it as cooked without serializing does result into an error. If that is what you want, you will need to dump // the profile to memry or disk and then reopen it. cmsBool CMSEXPORT cmsWriteRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, const void* data, cmsUInt32Number Size) diff --git a/src/cmslut.c b/src/cmslut.c index 5ed6e7e..4be839b 100644 --- a/src/cmslut.c +++ b/src/cmslut.c @@ -811,7 +811,7 @@ cmsBool CMSEXPORT cmsStageSampleCLut16bit(cmsStage* mpe, cmsSAMPLER16 Sampler, v return TRUE; } -// Same as anterior, but for floting point +// Same as anterior, but for floating point cmsBool CMSEXPORT cmsStageSampleCLutFloat(cmsStage* mpe, cmsSAMPLERFLOAT Sampler, void * Cargo, cmsUInt32Number dwFlags) { int i, t, nTotalPoints, index, rest; @@ -995,7 +995,7 @@ cmsStage* _cmsStageAllocLabV2ToV4curves(cmsContext ContextID) return NULL; } - // We need to map * (0xffff / 0xff00), thats same as (257 / 256) + // We need to map * (0xffff / 0xff00), that's same as (257 / 256) // So we can use 258-entry tables to do the trick (i / 257) * (255 * 257) * (257 / 256); for (i=0; i < 257; i++) { @@ -1277,7 +1277,7 @@ cmsStage* CMSEXPORT cmsStageDup(cmsStage* mpe) static cmsBool BlessLUT(cmsPipeline* lut) { - // We can set the input/ouput channels only if we have elements. + // We can set the input/output channels only if we have elements. if (lut ->Elements != NULL) { cmsStage* prev; diff --git a/src/cmsopt.c b/src/cmsopt.c index 2aa2c52..8597702 100644 --- a/src/cmsopt.c +++ b/src/cmsopt.c @@ -216,7 +216,7 @@ cmsBool _MultiplyMatrix(cmsPipeline* Lut) // Multiply both matrices to get the result _cmsMAT3per(&res, (cmsMAT3*)m2->Double, (cmsMAT3*)m1->Double); - // Get the next in chain afer the matrices + // Get the next in chain after the matrices chain = (*pt2)->Next; // Remove both matrices @@ -691,7 +691,7 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3 goto Error; // Remove prelinearization. Since we have duplicated the curve - // in destination LUT, the sampling shoud be applied after this stage. + // in destination LUT, the sampling should be applied after this stage. cmsPipelineUnlinkStage(Src, cmsAT_BEGIN, &KeepPreLin); } } @@ -723,14 +723,14 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3 if (!cmsPipelineInsertStage(Dest, cmsAT_END, NewPostLin)) goto Error; - // In destination LUT, the sampling shoud be applied after this stage. + // In destination LUT, the sampling should be applied after this stage. cmsPipelineUnlinkStage(Src, cmsAT_END, &KeepPostLin); } } } // Now its time to do the sampling. We have to ignore pre/post linearization - // The source LUT whithout pre/post curves is passed as parameter. + // The source LUT without pre/post curves is passed as parameter. if (!cmsStageSampleCLut16bit(CLUT, XFormSampler16, (void*) Src, 0)) { Error: // Ops, something went wrong, Restore stages diff --git a/src/cmstypes.c b/src/cmstypes.c index 76b4a82..ec4e154 100644 --- a/src/cmstypes.c +++ b/src/cmstypes.c @@ -960,7 +960,7 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO cmsBool rc = FALSE; char Filler[68]; - // Used below for writting zeroes + // Used below for writing zeroes memset(Filler, 0, sizeof(Filler)); // Get the len of string @@ -1185,7 +1185,7 @@ void Type_Curve_Free(struct _cms_typehandler_struct* self, void* Ptr) // ******************************************************************************** -// Decide which curve type to use on writting +// Decide which curve type to use on writing static cmsTagTypeSignature DecideCurveType(cmsFloat64Number ICCVersion, const void *Data) { @@ -1578,7 +1578,7 @@ void Type_MLU_Free(struct _cms_typehandler_struct* self, void* Ptr) // Type cmsSigLut8Type // ******************************************************************************** -// Decide which LUT type to use on writting +// Decide which LUT type to use on writing static cmsTagTypeSignature DecideLUTtypeA2B(cmsFloat64Number ICCVersion, const void *Data) { @@ -4532,7 +4532,7 @@ cmsBool Type_MPE_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, v _cmsTagSignature2String(String, (cmsTagSignature) ElementSig); - // An unknow element was found. + // An unknown element was found. cmsSignalError(self->ContextID, cmsERROR_UNKNOWN_EXTENSION, "Found unknown MPE type '%s'", String); goto Error; } diff --git a/src/cmswtpnt.c b/src/cmswtpnt.c index c6b6125..949c8a5 100644 --- a/src/cmswtpnt.c +++ b/src/cmswtpnt.c @@ -266,7 +266,7 @@ cmsBool _cmsAdaptMatrixToD50(cmsMAT3* r, const cmsCIExyY* SourceWhitePt) // Build a White point, primary chromas transfer matrix from RGB to CIE XYZ // This is just an approximation, I am not handling all the non-linear // aspects of the RGB to XYZ process, and assumming that the gamma correction -// has transitive property in the tranformation chain. +// has transitive property in the transformation chain. // // the alghoritm: // diff --git a/src/lcms2_internal.h b/src/lcms2_internal.h index 75c4893..adaa921 100644 --- a/src/lcms2_internal.h +++ b/src/lcms2_internal.h @@ -77,7 +77,7 @@ // Maximum of channels for internal pipeline evaluation #define MAX_STAGE_CHANNELS 128 -// Unused parameter warning supression +// Unused parameter warning suppression #define cmsUNUSED_PARAMETER(x) ((void)x) // The specification for "inline" is section 6.7.4 of the C99 standard (ISO/IEC 9899:1999). @@ -493,7 +493,7 @@ struct _cmsContext_struct { void* chunks[MemoryClientMax]; // array of pointers to client chunks. Memory itself is hold in the suballocator. // If NULL, then it reverts to global Context0 - _cmsMemPluginChunkType DefaultMemoryManager; // The allocators used for creating the context itself. Cannot be overriden + _cmsMemPluginChunkType DefaultMemoryManager; // The allocators used for creating the context itself. Cannot be overridden }; // Returns a pointer to a valid context structure, including the global one if id is zero. diff --git a/testbed/testcms2.c b/testbed/testcms2.c index 166b528..6ad1b86 100644 --- a/testbed/testcms2.c +++ b/testbed/testcms2.c @@ -2731,7 +2731,7 @@ cmsToneCurve* Build_sRGBGamma(void) -// Join two gamma tables in floting point format. Result should be a straight line +// Join two gamma tables in floating point format. Result should be a straight line static cmsToneCurve* CombineGammaFloat(cmsToneCurve* g1, cmsToneCurve* g2) { diff --git a/utils/tificc/tificc.c b/utils/tificc/tificc.c index 9ebf45e..8e6fbc0 100644 --- a/utils/tificc/tificc.c +++ b/utils/tificc/tificc.c @@ -650,7 +650,7 @@ void CopyOtherTags(TIFF* in, TIFF* out) } -// A replacement for (the nonstandard) filelenght +// A replacement for (the nonstandard) filelength static |