commit 38f22d2df48eb721e42f9dabeaa16ad35870e355
author Mike Klein <mtklein@chromium.org> Tue Apr 17 09:34:41 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 17 13:42:18 2018 +0000
tree 005b7d625774f3622bce6fd239a2c8ed02d6b84a
parent 89de187efe1b6af3eba22228517bbcb075bae51b

name types in skcms.h

The typedefs make code read pretty,
but having names too should allow forward declaration.

Change-Id: I5b1c3e468f332f7267a294184f48a0da8fcdccff
Reviewed-on: https://skia-review.googlesource.com/121788
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

skcms.h

diff --git a/skcms.h b/skcms.h
index 4e18580..4d0ffc9 100644
--- a/skcms.h
+++ b/skcms.h
@@ -18,12 +18,12 @@
 #endif
 
 // A row-major 3x3 matrix (ie vals[row][col])
-typedef struct {
+typedef struct skcms_Matrix3x3 {
     float vals[3][3];
 } skcms_Matrix3x3;
 
 // A row-major 3x4 matrix (ie vals[row][col])
-typedef struct {
+typedef struct skcms_Matrix3x4 {
     float vals[3][4];
 } skcms_Matrix3x4;
 
@@ -34,12 +34,12 @@
 //          = sign(encoded) * ((a*|encoded| + b)^g + e), d <= |encoded|
 //
 // (A simple gamma transfer function sets g to gamma and a to 1.)
-typedef struct {
+typedef struct skcms_TransferFunction {
     float g, a,b,c,d,e,f;
 } skcms_TransferFunction;
 
 // Unified representation of 'curv' or 'para' tag data, or a 1D table from 'mft1' or 'mft2'
-typedef union {
+typedef union skcms_Curve {
     struct {
         uint32_t alias_of_table_entries;
         skcms_TransferFunction parametric;
@@ -51,7 +51,7 @@
     };
 } skcms_Curve;
 
-typedef struct {
+typedef struct skcms_A2B {
     // Optional: N 1D curves, followed by an N-dimensional CLUT.
     // If input_channels == 0, these curves and CLUT are skipped,
     // Otherwise, input_channels must be in [1, 4].
@@ -73,7 +73,7 @@
     skcms_Curve     output_curves[3];
 } skcms_A2B;
 
-typedef struct {
+typedef struct skcms_ICCProfile {
     const uint8_t* buffer;
 
     uint32_t size;
@@ -117,7 +117,7 @@
 
 // A specialized approximation for transfer functions with gamma between 1 and 3.
 //     f(x) = Ax^3 + Bx^2 + (1-A-B)x
-typedef struct {
+typedef struct skcms_TF13 {
     float A,B;
 } skcms_TF13;
 
@@ -127,7 +127,7 @@
 // no real upper bound on the error of this transfer function.
 skcms_TransferFunction skcms_BestSingleCurve(const skcms_ICCProfile*);
 
-typedef struct {
+typedef struct skcms_ICCTag {
     uint32_t       signature;
     uint32_t       type;
     uint32_t       size;
@@ -137,7 +137,7 @@
 void skcms_GetTagByIndex    (const skcms_ICCProfile*, uint32_t idx, skcms_ICCTag*);
 bool skcms_GetTagBySignature(const skcms_ICCProfile*, uint32_t sig, skcms_ICCTag*);
 
-typedef enum {
+typedef enum skcms_PixelFormat {
     skcms_PixelFormat_RGB_565,
     skcms_PixelFormat_BGR_565,
 
@@ -177,7 +177,7 @@
 // with non-color-managed drawing systems, PremulAsEncoded is probably the "premul"
 // you're looking for; if you want linear blending, PremulLinear is the choice for you.
 
-typedef enum {
+typedef enum skcms_AlphaFormat {
     skcms_AlphaFormat_Opaque,          // alpha is always opaque
                                        //   tf-1(r),   tf-1(g),   tf-1(b),   1.0
     skcms_AlphaFormat_Unpremul,        // alpha and color are unassociated