diff --git a/third_party/skcms/skcms.h b/third_party/skcms/skcms.h index b4c0f4c001..cbabfc8fc4 100644 --- a/third_party/skcms/skcms.h +++ b/third_party/skcms/skcms.h @@ -27,6 +27,10 @@ typedef struct skcms_Matrix3x3 { float vals[3][3]; } skcms_Matrix3x3; +// It is _not_ safe to alias the pointers to invert in-place. +SKCMS_API bool skcms_Matrix3x3_invert(const skcms_Matrix3x3*, skcms_Matrix3x3*); +SKCMS_API skcms_Matrix3x3 skcms_Matrix3x3_concat(const skcms_Matrix3x3*, const skcms_Matrix3x3*); + // A row-major 3x4 matrix (ie vals[row][col]) typedef struct skcms_Matrix3x4 { float vals[3][4]; @@ -43,8 +47,9 @@ typedef struct skcms_TransferFunction { float g, a,b,c,d,e,f; } skcms_TransferFunction; -SKCMS_API bool skcms_TransferFunction_invert(const skcms_TransferFunction*, - skcms_TransferFunction*); +SKCMS_API float skcms_TransferFunction_eval (const skcms_TransferFunction*, float); +SKCMS_API bool skcms_TransferFunction_invert(const skcms_TransferFunction*, + skcms_TransferFunction*); // Unified representation of 'curv' or 'para' tag data, or a 1D table from 'mft1' or 'mft2' typedef union skcms_Curve { diff --git a/third_party/skcms/skcms_internal.h b/third_party/skcms/skcms_internal.h index 384cad0f34..4b0c39507d 100644 --- a/third_party/skcms/skcms_internal.h +++ b/third_party/skcms/skcms_internal.h @@ -21,9 +21,6 @@ extern "C" { // ~~~~ General Helper Macros ~~~~ #define ARRAY_COUNT(arr) (int)(sizeof((arr)) / sizeof(*(arr))) -// ~~~~ skcms_TransferFunction ~~~~ - float skcms_TransferFunction_eval (const skcms_TransferFunction*, float); - // ~~~~ skcms_ICCProfile ~~~~ bool skcms_GetCHAD(const skcms_ICCProfile* profile, skcms_Matrix3x3* m); @@ -32,11 +29,6 @@ extern "C" { // Used for ICC profile equivalence testing. extern const uint8_t skcms_252_random_bytes[252]; -// ~~~~ Linear Algebra ~~~~ - // It is _not_ safe to alias the pointers to invert in-place. - bool skcms_Matrix3x3_invert(const skcms_Matrix3x3*, skcms_Matrix3x3*); - skcms_Matrix3x3 skcms_Matrix3x3_concat(const skcms_Matrix3x3* A, const skcms_Matrix3x3* B); - // ~~~~ Portable Math ~~~~ static inline float floorf_(float x) { float roundtrip = (float)((int)x); diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 452c497393..f3de282234 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -1c1d5560df1177e865823b632a0c12fffef52766 \ No newline at end of file +dfd5b3a4a61f6fe1f91e0370d100132c17e29ca6 \ No newline at end of file