| OLD | NEW |
| 1 diff --git a/third_party/qcms/src/iccread.c b/third_party/qcms/src/iccread.c | 1 diff --git a/third_party/qcms/src/iccread.c b/third_party/qcms/src/iccread.c |
| 2 index 36b7011..0523846 100644 | 2 index 36b7011..0523846 100644 |
| 3 --- a/third_party/qcms/src/iccread.c | 3 --- a/third_party/qcms/src/iccread.c |
| 4 +++ b/third_party/qcms/src/iccread.c | 4 +++ b/third_party/qcms/src/iccread.c |
| 5 @@ -266,7 +266,7 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile) | 5 @@ -266,7 +266,7 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile) |
| 6 if (profile->color_space != RGB_SIGNATURE) | 6 if (profile->color_space != RGB_SIGNATURE) |
| 7 return false; | 7 return false; |
| 8 | 8 |
| 9 - if (profile->A2B0 || profile->B2A0) | 9 - if (profile->A2B0 || profile->B2A0) |
| 10 + if (qcms_supports_iccv4 && (profile->A2B0 || profile->B2A0)) | 10 + if (qcms_supports_iccv4 && (profile->A2B0 || profile->B2A0)) |
| (...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 } | 781 } |
| 782 | 782 |
| 783 struct matrix build_colorant_matrix(qcms_profile *p) | 783 struct matrix build_colorant_matrix(qcms_profile *p) |
| 784 diff --git a/third_party/qcms/src/transform.c b/third_party/qcms/src/transform.c | 784 diff --git a/third_party/qcms/src/transform.c b/third_party/qcms/src/transform.c |
| 785 index 976c498..44ce9b5 100644 | 785 index 976c498..44ce9b5 100644 |
| 786 --- a/third_party/qcms/src/transform.c | 786 --- a/third_party/qcms/src/transform.c |
| 787 +++ b/third_party/qcms/src/transform.c | 787 +++ b/third_party/qcms/src/transform.c |
| 788 @@ -1324,8 +1324,18 @@ qcms_transform* qcms_transform_create( | 788 @@ -1324,8 +1324,18 @@ qcms_transform* qcms_transform_create( |
| 789 } | 789 } |
| 790 | 790 |
| 791 #if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) | 791 #if defined(__GNUC__) && !defined(__x86_64__) && !defined(__amd64__) && !define
d(__arm__) |
| 792 +#if !defined(__has_attribute) | 792 +#if !defined(__has_attribute) |
| 793 +/* Assume that the compiler supports the provided attribute. */ | 793 +/* Assume that the compiler supports the provided attribute. */ |
| 794 +#define __has_attribute(x) 1 | 794 +#define __has_attribute(x) 1 |
| 795 +#endif | 795 +#endif |
| 796 +#if __has_attribute(__force_align_arg_pointer__) | 796 +#if __has_attribute(__force_align_arg_pointer__) |
| 797 /* we need this to avoid crashes when gcc assumes the stack is 128bit aligned *
/ | 797 /* we need this to avoid crashes when gcc assumes the stack is 128bit aligned *
/ |
| 798 __attribute__((__force_align_arg_pointer__)) | 798 __attribute__((__force_align_arg_pointer__)) |
| 799 +#else | 799 +#else |
| 800 +/* __force_align_arg_pointer__ is an x86-only attribute, and clang warns on use
d | 800 +/* __force_align_arg_pointer__ is an x86-only attribute, and clang warns on use
d |
| 801 + * attributes. Don't use this on ARM. | 801 + * attributes. Don't use this on ARM. |
| 802 + */ | 802 + */ |
| 803 +#endif | 803 +#endif |
| 804 #endif | 804 #endif |
| 805 void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size
_t length) | 805 void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size
_t length) |
| 806 { | 806 { |
| 807 | 807 |
| OLD | NEW |