| OLD | NEW |
| (Empty) | |
| 1 diff --git a/third_party/lcms2-2.6/src/cmscgats.c b/third_party/lcms2-2.6/src/cm
scgats.c |
| 2 index 9017435..5720c66 100644 |
| 3 --- a/third_party/lcms2-2.6/src/cmscgats.c |
| 4 +++ b/third_party/lcms2-2.6/src/cmscgats.c |
| 5 @@ -258,7 +258,7 @@ static PROPERTY PredefinedProperties[] = { |
| 6 // needed. |
| 7 |
| 8 {"SAMPLE_BACKING", WRITE_STRINGIFY}, // Identifies the backing mate
rial used behind the sample during |
| 9 - // measurement. Allowed values are black? whit
e? or {"na". |
| 10 + // measurement. Allowed values are "black" "whit
e" or "na". |
| 11 |
| 12 {"CHISQ_DOF", WRITE_STRINGIFY}, // Degrees of freedom associat
ed with the Chi squared statistic |
| 13 |
| 14 @@ -274,7 +274,7 @@ static PROPERTY PredefinedProperties[] = { |
| 15 // denote the use of filters such as none, D65,
Red, Green or Blue. |
| 16 |
| 17 {"POLARIZATION", WRITE_STRINGIFY}, // Identifies the use of a phy
sical polarization filter during measurement. Allowed |
| 18 - // values are {"yes? white? none?or na? |
| 19 + // values are "yes" "white" "none" or "na" |
| 20 |
| 21 {"WEIGHTING_FUNCTION", WRITE_PAIR}, // Indicates such functions as: th
e CIE standard observer functions used in the |
| 22 // calculation of various data parameters (2 deg
ree and 10 degree), CIE standard |
| 23 diff --git a/third_party/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cm
stypes.c |
| 24 index 386439b..e5ed06c 100644 |
| 25 --- a/third_party/lcms2-2.6/src/cmstypes.c |
| 26 +++ b/third_party/lcms2-2.6/src/cmstypes.c |
| 27 @@ -962,7 +962,7 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler
_struct* self, cmsIO |
| 28 len = cmsMLUgetASCII(mlu, cmsNoLanguage, cmsNoCountry, NULL, 0); |
| 29 |
| 30 // From ICC3.4: It has been found that textDescriptionType can contain misa
ligned data |
| 31 - //(see clause 4.1 for the definition of aligned?. Because the Unicode lang
uage |
| 32 + //(see clause 4.1 for the definition of 'aligned'. Because the Unicode lang
uage |
| 33 // code and Unicode count immediately follow the ASCII description, their |
| 34 // alignment is not correct if the ASCII count is not a multiple of four. T
he |
| 35 // ScriptCode code is misaligned when the ASCII count is odd. Profile readi
ng and |
| 36 @@ -3064,9 +3064,10 @@ void Type_ColorantTable_Free(struct _cms_typehandler_stru
ct* self, void* Ptr) |
| 37 //The namedColor2Type is a count value and array of structures that provide col
or |
| 38 //coordinates for 7-bit ASCII color names. For each named color, a PCS and opti
onal |
| 39 //device representation of the color are given. Both representations are 16-bit
values. |
| 40 -//The device representation corresponds to the headers color space of data?fi
eld. |
| 41 -//This representation should be consistent with the number of device component
s?//field in the namedColor2Type. If this field is 0, device coordinates are not
provided. |
| 42 -//The PCS representation corresponds to the headers PCS field. The PCS represe
ntation |
| 43 +//The device representation corresponds to the header's 'color space of data' f
ield. |
| 44 +//This representation should be consistent with the 'number of device component
s' |
| 45 +//field in the namedColor2Type. If this field is 0, device coordinates are not
provided. |
| 46 +//The PCS representation corresponds to the header's PCS field. The PCS represe
ntation |
| 47 //is always provided. Color names are fixed-length, 32-byte fields including nu
ll |
| 48 //termination. In order to maintain maximum portability, it is strongly recomme
nded |
| 49 //that special characters of the 7-bit ASCII set not be used. |
| 50 @@ -3809,7 +3810,8 @@ void Type_Screening_Free(struct _cms_typehandler_struct* s
elf, void* Ptr) |
| 51 // ****************************************************************************
**** |
| 52 // |
| 53 //This type represents a set of viewing condition parameters including: |
| 54 -//CIE absolute?illuminant white point tristimulus values and CIE absolute?//s
urround tristimulus values. |
| 55 +//CIE 'absolute'illuminant white point tristimulus values and CIE 'absolute' |
| 56 +//surround tristimulus values. |
| 57 |
| 58 static |
| 59 void *Type_ViewingConditions_Read(struct _cms_typehandler_struct* self, cmsIOHA
NDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag) |
| 60 @@ -3895,7 +3897,7 @@ void GenericMPEfree(struct _cms_typehandler_struct* self,
void *Ptr) |
| 61 } |
| 62 |
| 63 // Each curve is stored in one or more curve segments, with break-points specif
ied between curve segments. |
| 64 -// The first curve segment always starts at Infinity, and the last curve segme
nt always ends at +Infinity. The |
| 65 +// The first curve segment always starts at -Infinity, and the last curve segme
nt always ends at +Infinity. The |
| 66 // first and last curve segments shall be specified in terms of a formula, wher
eas the other segments shall be |
| 67 // specified either in terms of a formula, or by a sampled curve. |
| 68 |
| 69 diff --git a/third_party/lcms2-2.6/src/cmsvirt.c b/third_party/lcms2-2.6/src/cms
virt.c |
| 70 index b324c99..d19ace1 100644 |
| 71 --- a/third_party/lcms2-2.6/src/cmsvirt.c |
| 72 +++ b/third_party/lcms2-2.6/src/cmsvirt.c |
| 73 @@ -612,18 +612,18 @@ cmsHPROFILE CMSEXPORT cmsCreateXYZProfile(void) |
| 74 |
| 75 //sRGB Curves are defined by: |
| 76 // |
| 77 -//If RsRGB,GsRGB, BsRGB < 0.04045 |
| 78 +//If R'sRGB,G'sRGB, B'sRGB < 0.04045 |
| 79 // |
| 80 -// R = RsRGB / 12.92 |
| 81 -// G = GsRGB / 12.92 |
| 82 -// B = BsRGB / 12.92 |
| 83 +// R = R'sRGB / 12.92 |
| 84 +// G = G'sRGB / 12.92 |
| 85 +// B = B'sRGB / 12.92 |
| 86 // |
| 87 // |
| 88 -//else if RsRGB,GsRGB, BsRGB >= 0.04045 |
| 89 +//else if R'sRGB,G'sRGB, B'sRGB >= 0.04045 |
| 90 // |
| 91 -// R = ((RsRGB + 0.055) / 1.055)^2.4 |
| 92 -// G = ((GsRGB + 0.055) / 1.055)^2.4 |
| 93 -// B = ((BsRGB + 0.055) / 1.055)^2.4 |
| 94 +// R = ((R'sRGB + 0.055) / 1.055)^2.4 |
| 95 +// G = ((G'sRGB + 0.055) / 1.055)^2.4 |
| 96 +// B = ((B'sRGB + 0.055) / 1.055)^2.4 |
| 97 |
| 98 static |
| 99 cmsToneCurve* Build_sRGBGamma(cmsContext ContextID) |
| OLD | NEW |