Apply upstream qcmstypes.h patch to avoid conflicts with MSVC's stdint.h

third_party/qcms/google.patch

 diff --git a/third_party/qcms/src/iccread.c b/third_party/qcms/src/iccread.c
 index 36b7011..9ee6b94 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 153 matching lines @@
 +#define qcms_atomic_increment(x) _InterlockedIncrement((long volatile *)&x)
 +#define qcms_atomic_decrement(x) _InterlockedDecrement((long volatile*)&x)
 +
 +#else
 +
 +#define qcms_atomic_increment(x) __sync_add_and_fetch(&x, 1)
 +#define qcms_atomic_decrement(x) __sync_sub_and_fetch(&x, 1)
 +
 +#endif
 diff --git a/third_party/qcms/src/qcmstypes.h b/third_party/qcms/src/qcmstypes.h
-index 56d8de3..9a9b197 100644
+index 56d8de3..d58f691 100644
 --- a/third_party/qcms/src/qcmstypes.h
 +++ b/third_party/qcms/src/qcmstypes.h
-@@ -87,7 +87,12 @@ typedef unsigned __int64 uint64_t;
+@@ -22,37 +22,6 @@
+ #ifndef QCMS_TYPES_H
+ #define QCMS_TYPES_H
+ 
+-#ifdef MOZ_QCMS
+-
+-#include "prtypes.h"
+-
+-/* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
+-
+-#if defined (__SVR4) && defined (__sun)
+-/* int_types.h gets included somehow, so avoid redefining the types differently */
+-#include <sys/int_types.h>
+-#elif defined (_AIX)
+-#include <sys/types.h>
+-#elif !defined(ANDROID) && !defined(__OpenBSD__)
+-typedef PRInt8 int8_t;
+-typedef PRUint8 uint8_t;
+-typedef PRInt16 int16_t;
+-typedef PRUint16 uint16_t;
+-typedef PRInt32 int32_t;
+-typedef PRUint32 uint32_t;
+-typedef PRInt64 int64_t;
+-typedef PRUint64 uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+-#include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef PRUptrdiff uintptr_t;
+-#endif
+-#endif
+-
+-#else // MOZ_QCMS
+-
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ #define IS_LITTLE_ENDIAN
+ #elif BYTE_ORDER == BIG_ENDIAN
+@@ -75,7 +44,7 @@ typedef PRUptrdiff uintptr_t;
+ 
+ #if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || defined (_sgi) || defined (__sun) || defined (sun) || defined (__digital__)
+ #  include <inttypes.h>
+-#elif defined (_MSC_VER)
++#elif defined (_MSC_VER) && _MSC_VER < 1600
+ typedef __int8 int8_t;
+ typedef unsigned __int8 uint8_t;
+ typedef __int16 int16_t;
+@@ -87,7 +56,12 @@ typedef unsigned __int64 uint64_t;
  #ifdef _WIN64
  typedef unsigned __int64 uintptr_t;
  #else
 +#pragma warning(push)
 +/* Disable benign redefinition of type warning 4142 */
 +#pragma warning(disable:4142)
  typedef unsigned long uintptr_t;
 +/* Restore warnings */
 +#pragma warning(pop)
  #endif
  
  #elif defined (_AIX)
+@@ -96,8 +70,6 @@ typedef unsigned long uintptr_t;
+ #  include <stdint.h>
+ #endif
+ 
+-#endif
+-
+ typedef qcms_bool bool;
+ #define true 1
+ #define false 0
 diff --git a/third_party/qcms/src/transform-sse1.c b/third_party/qcms/src/transform-sse1.c
 index 2f34db5..aaee1bf 100644
 --- a/third_party/qcms/src/transform-sse1.c
 +++ b/third_party/qcms/src/transform-sse1.c
 @@ -34,7 +34,8 @@ static const ALIGN float clampMaxValueX4[4] =
  void qcms_transform_data_rgb_out_lut_sse1(qcms_transform *transform,
                                            unsigned char *src,
                                            unsigned char *dest,
 -                                          size_t length)
 +                                          size_t length,
@@ skipping 745 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)