Update from https://crrev.com/311076

third_party/qcms/google.patch

 diff --git a/third_party/qcms/src/iccread.c b/third_party/qcms/src/iccread.c
-index 36b7011..69b7141 100644
+index 36b7011..aca19d3 100644
 --- a/third_party/qcms/src/iccread.c
 +++ b/third_party/qcms/src/iccread.c
 @@ -266,7 +266,7 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile)
         if (profile->color_space != RGB_SIGNATURE)
                return false;
  
 -       if (profile->A2B0 || profile->B2A0)
 +       if (qcms_supports_iccv4 && (profile->A2B0 || profile->B2A0))
                 return false;
  
@@ skipping 144 matching lines @@
 @@ -1028,6 +1089,9 @@ qcms_profile* qcms_profile_from_memory(const void *mem, size_t size)
         if (!src->valid || !index.tags)
                 goto invalid_tag_table;
  
 +       if (!read_tag_descType(profile, src, index, TAG_desc))
 +               goto invalid_tag_table;
 +
         if (find_tag(index, TAG_CHAD)) {
                 profile->chromaticAdaption = read_tag_s15Fixed16ArrayType(src, index, TAG_CHAD);
         } else {
-@@ -1098,6 +1162,11 @@ invalid_profile:
+@@ -1098,6 +1162,16 @@ invalid_profile:
         return INVALID_PROFILE;
  }
  
 +qcms_bool qcms_profile_match(qcms_profile *p1, qcms_profile *p2)
 +{
 +    return memcmp(p1->description, p2->description, sizeof p1->description) == 0;
 +}
 +
++const char* qcms_profile_get_description(qcms_profile *profile)
++{
++    return profile->description;
++}
++
  qcms_intent qcms_profile_get_rendering_intent(qcms_profile *profile)
  {
         return profile->rendering_intent;
 diff --git a/third_party/qcms/src/qcms.h b/third_party/qcms/src/qcms.h
-index 7d83623..e59528a 100644
+index 7d83623..c69a772 100644
 --- a/third_party/qcms/src/qcms.h
 +++ b/third_party/qcms/src/qcms.h
 @@ -40,6 +40,12 @@ sale, use or other dealings in this Software without written
  authorization from SunSoft Inc. 
  ******************************************************************/
  
 +/*
 + * QCMS, in general, is not threadsafe. However, it should be safe to create
 + * profile and transformation objects on different threads, so long as you
 + * don't use the same objects on different threads at the same time.
 + */
 +
  /* 
   * Color Space Signatures
   * Note that only icSigXYZData and icSigLabData are valid
 @@ -102,6 +108,12 @@ typedef enum {
         QCMS_DATA_GRAYA_8
  } qcms_data_type;
  
 +/* Format of the output data for qcms_transform_data_type() */
 +typedef enum {
 +       QCMS_OUTPUT_RGBX,
 +       QCMS_OUTPUT_BGRX
 +} qcms_output_type;
 +
  /* the names for the following two types are sort of ugly */
  typedef struct
  {
-@@ -136,6 +148,8 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile);
+@@ -136,6 +148,9 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile);
  qcms_intent qcms_profile_get_rendering_intent(qcms_profile *profile);
  icColorSpaceSignature qcms_profile_get_color_space(qcms_profile *profile);
  
 +qcms_bool qcms_profile_match(qcms_profile *p1, qcms_profile *p2);
++const char* qcms_profile_get_description(qcms_profile *profile);
 +
  void qcms_profile_precache_output_transform(qcms_profile *profile);
  
  qcms_transform* qcms_transform_create(
-@@ -146,6 +160,7 @@ qcms_transform* qcms_transform_create(
+@@ -146,6 +161,7 @@ qcms_transform* qcms_transform_create(
  void qcms_transform_release(qcms_transform *);
  
  void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size_t length);
 +void qcms_transform_data_type(qcms_transform *transform, void *src, void *dest, size_t length, qcms_output_type type);
  
  void qcms_enable_iccv4();
  
 diff --git a/third_party/qcms/src/qcmsint.h b/third_party/qcms/src/qcmsint.h
 index 53a3420..4116ed5 100644
 --- a/third_party/qcms/src/qcmsint.h
@@ skipping 913 matching lines @@
  
 -float lut_interp_linear(double value, uint16_t *table, int length);
 -float lut_interp_linear_float(float value, float *table, int length);
 -uint16_t lut_interp_linear16(uint16_t input_value, uint16_t *table, int length);
 +float lut_interp_linear(double value, uint16_t *table, size_t length);
 +float lut_interp_linear_float(float value, float *table, size_t length);
 +uint16_t lut_interp_linear16(uint16_t input_value, uint16_t *table, size_t length);
  
  
  static inline float lerp(float a, float b, float t)