Fix compiler warning in qcms with gcc/arm

third_party/qcms/google.patch

 diff --git a/third_party/qcms/src/iccread.c b/third_party/qcms/src/iccread.c
 index 36b7011..0523846 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))
@@ skipping 295 matching lines @@
      _mm_store_si128((__m128i*)output, _mm_cvtps_epi32(result));
  
 -    dest[0] = otdata_r[output[0]];
 -    dest[1] = otdata_g[output[1]];
 -    dest[2] = otdata_b[output[2]];
 +    dest[r_out] = otdata_r[output[0]];
 +    dest[1]     = otdata_g[output[1]];
 +    dest[b_out] = otdata_b[output[2]];
  }
 diff --git a/third_party/qcms/src/transform.c b/third_party/qcms/src/transform.c
-index 9a6562b..1f4e72b 100644
+index 9a6562b..7312ced 100644
 --- a/third_party/qcms/src/transform.c
 +++ b/third_party/qcms/src/transform.c
 @@ -181,11 +181,20 @@ compute_chromatic_adaption(struct CIE_XYZ source_white_point,
  static struct matrix
  adaption_matrix(struct CIE_XYZ source_illumination, struct CIE_XYZ target_illumination)
  {
 +#if defined (_MSC_VER)
 +#pragma warning(push)
 +/* Disable double to float truncation warning 4305 */
 +#pragma warning(disable:4305)
@@ skipping 373 matching lines @@
 -       /* don't precache since we will use the mBA LUT */
 -       if (profile->mBA)
 -               return;
 +               /* don't precache since we will use the mBA LUT */
 +               if (profile->mBA)
 +                       return;
 +       }
  
         /* don't precache if we do not have the TRC curves */
         if (!profile->redTRC || !profile->greenTRC || !profile->blueTRC)
-@@ -1224,14 +1224,14 @@
+@@ -1157,14 +1224,14 @@ qcms_transform* qcms_transform_create(
                         return NULL;
                 }
                 if (precache) {
 -#ifdef X86
 +#if defined(SSE2_ENABLE) && defined(X86)
                     if (sse_version_available() >= 2) {
                             if (in_type == QCMS_DATA_RGB_8)
                                     transform->transform_fn = qcms_transform_data_rgb_out_lut_sse2;
                             else
                                     transform->transform_fn = qcms_transform_data_rgba_out_lut_sse2;
  
 -#if !(defined(_MSC_VER) && defined(_M_AMD64))
 +#if defined(SSE2_ENABLE) && !(defined(_MSC_VER) && defined(_M_AMD64))
                      /* Microsoft Compiler for x64 doesn't support MMX.
                       * SSE code uses MMX so that we disable on x64 */
                     } else
-@@ -1262,7 +1329,17 @@ __attribute__((__force_align_arg_pointer__))
+@@ -1256,13 +1323,34 @@ qcms_transform* qcms_transform_create(
+        return transform;
+ }
+ 
+-#if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
++/* __force_align_arg_pointer__ is an x86-only attribute, and gcc/clang warns on unused
++ * attributes. Don't use this on ARM or AMD64. __has_attribute can detect the presence
++ * of the attribute but is currently only supported by clang */
++#if defined(__has_attribute)
++#define HAS_FORCE_ALIGN_ARG_POINTER __has_attribute(__force_align_arg_pointer__)
++#elif defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && !defined(__arm__)
++#define HAS_FORCE_ALIGN_ARG_POINTER 1
++#else
++#define HAS_FORCE_ALIGN_ARG_POINTER 0
++#endif
++
++#if HAS_FORCE_ALIGN_ARG_POINTER
+ /* we need this to avoid crashes when gcc assumes the stack is 128bit aligned */
+ __attribute__((__force_align_arg_pointer__))
  #endif
  void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size_t length)
  {
 -       transform->transform_fn(transform, src, dest, length);
 +       static const struct _qcms_format_type output_rgbx = { 0, 2 };
 +
 +       transform->transform_fn(transform, src, dest, length, output_rgbx);
 +}
 +
 +void qcms_transform_data_type(qcms_transform *transform, void *src, void *dest, size_t length, qcms_output_type type)
@@ skipping 36 matching lines @@
                 }
         }
 -        return gamma_table;
 +
 +       validate_gamma_table(gamma_table);
 +
 +       return gamma_table;
  }
  
  struct matrix build_colorant_matrix(qcms_profile *p)
-diff --git a/third_party/qcms/src/transform.c b/third_party/qcms/src/transform.c
-index 976c498..44ce9b5 100644
---- a/third_party/qcms/src/transform.c
-+++ b/third_party/qcms/src/transform.c
-@@ -1324,8 +1324,18 @@ qcms_transform* qcms_transform_create(
- }
- 
- #if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__)
-+#if !defined(__has_attribute)
-+/* Assume that the compiler supports the provided attribute. */
-+#define __has_attribute(x) 1
-+#endif
-+#if __has_attribute(__force_align_arg_pointer__)
- /* we need this to avoid crashes when gcc assumes the stack is 128bit aligned */
- __attribute__((__force_align_arg_pointer__))
-+#else
-+/* __force_align_arg_pointer__ is an x86-only attribute, and clang warns on used
-+ * attributes. Don't use this on ARM.
-+ */
-+#endif
- #endif
- void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size_t length)
- {
-