diff options
| -rw-r--r-- | third_party/WebKit/LayoutTests/whitespace.txt | 1 | ||||
| -rw-r--r-- | third_party/qcms/BUILD.gn | 6 | ||||
| -rw-r--r-- | third_party/qcms/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/qcms/qcms.gyp | 18 | ||||
| -rw-r--r-- | third_party/qcms/src/tests/qcms_test_tetra_clut_rgba.c | 19 |
5 files changed, 35 insertions, 11 deletions
diff --git a/third_party/WebKit/LayoutTests/whitespace.txt b/third_party/WebKit/LayoutTests/whitespace.txt index 7fb10c4..a1d6222 100644 --- a/third_party/WebKit/LayoutTests/whitespace.txt +++ b/third_party/WebKit/LayoutTests/whitespace.txt @@ -13,3 +13,4 @@ Her retort: "I implemented <blink> in Blink using Javscript!" A PNG image exploded nearby, "Aw Snap!". What was that? T'was the sound of a broken interval record. + diff --git a/third_party/qcms/BUILD.gn b/third_party/qcms/BUILD.gn index cfb042b..9c015d1 100644 --- a/third_party/qcms/BUILD.gn +++ b/third_party/qcms/BUILD.gn @@ -49,9 +49,11 @@ source_set("qcms") { } } -if (!disable_qcms && (current_cpu == "x86" || current_cpu == "x64")) { +if (!disable_qcms) { executable("qcms_tests") { - defines = [ "SSE2_ENABLE" ] + if (current_cpu == "x86" || current_cpu == "x64") { + defines = [ "SSE2_ENABLE" ] + } sources = [ "src/tests/qcms_test_internal_srgb.c", "src/tests/qcms_test_main.c", diff --git a/third_party/qcms/README.chromium b/third_party/qcms/README.chromium index feb63dc..17ddb5d 100644 --- a/third_party/qcms/README.chromium +++ b/third_party/qcms/README.chromium @@ -141,6 +141,8 @@ The following changes have been made since qcms was imported: - https://code.google.com/p/chromium/issues/detail?id=495196 - Add qcms_profile_ntsc_relative_gamut_size api - https://code.google.com/p/chromium/issues/detail?id=582870 + - Fix build issue of qcms_tests for MIPS Linux + - https://code.google.com/p/chromium/issues/detail?id=590227 For the Chromium changes, since the import, in a patch format run: git diff b8456f38 src diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp index 9e19a44..2bade45 100644 --- a/third_party/qcms/qcms.gyp +++ b/third_party/qcms/qcms.gyp @@ -76,9 +76,6 @@ 'target_name': 'qcms_tests', 'product_name': 'qcms_tests', 'type': 'executable', - 'defines': [ - 'SSE2_ENABLE', - ], 'dependencies': [ 'qcms', ], @@ -89,15 +86,18 @@ ], }], ['target_arch=="ia32" or target_arch=="x64"', { - 'sources': [ - 'src/tests/qcms_test_tetra_clut_rgba.c', - 'src/tests/qcms_test_main.c', - 'src/tests/qcms_test_internal_srgb.c', - 'src/tests/qcms_test_munsell.c', - 'src/tests/qcms_test_ntsc_gamut.c', + 'defines': [ + 'SSE2_ENABLE', ], }], ], + 'sources': [ + 'src/tests/qcms_test_main.c', + 'src/tests/qcms_test_internal_srgb.c', + 'src/tests/qcms_test_munsell.c', + 'src/tests/qcms_test_ntsc_gamut.c', + 'src/tests/qcms_test_tetra_clut_rgba.c', + ], }, ], }], diff --git a/third_party/qcms/src/tests/qcms_test_tetra_clut_rgba.c b/third_party/qcms/src/tests/qcms_test_tetra_clut_rgba.c index e1fc5b9..81b6ee3 100644 --- a/third_party/qcms/src/tests/qcms_test_tetra_clut_rgba.c +++ b/third_party/qcms/src/tests/qcms_test_tetra_clut_rgba.c @@ -19,11 +19,26 @@ extern void qcms_transform_data_tetra_clut_rgba(qcms_transform *transform, size_t length, qcms_format_type output_format); +#ifdef SSE2_ENABLE extern void qcms_transform_data_tetra_clut_rgba_sse2(qcms_transform *transform, unsigned char *src, unsigned char *dest, size_t length, qcms_format_type output_format); +#else +void qcms_transform_data_tetra_clut_rgba_dummy(qcms_transform *transform, + unsigned char *src, + unsigned char *dest, + size_t length, + qcms_format_type output_format) +{ + (void)(transform); + (void)(src); + (void)(dest); + (void)(length); + (void)(output_format); +} +#endif static float *create_lut(size_t lutSize) { @@ -123,7 +138,11 @@ static int qcms_test_tetra_clut_rgba(size_t width, memcpy(src1, src0, length * pixel_size); #define TRANSFORM_TEST0 qcms_transform_data_tetra_clut_rgba +#ifdef SSE2_ENABLE #define TRANSFORM_TEST1 qcms_transform_data_tetra_clut_rgba_sse2 +#else +#define TRANSFORM_TEST1 qcms_transform_data_tetra_clut_rgba_dummy +#endif TIME(TRANSFORM_TEST0(&transform0, src0, dst0, length, format), &time0); TIME(TRANSFORM_TEST1(&transform1, src1, dst1, length, format), &time1); |