OLD | NEW |
1 diff --git a/src/iccread.c b/src/iccread.c | 1 diff --git a/src/iccread.c b/src/iccread.c |
2 index 36b7011..2454924 100644 | 2 index 36b7011..2454924 100644 |
3 --- a/src/iccread.c | 3 --- a/src/iccread.c |
4 +++ b/src/iccread.c | 4 +++ b/src/iccread.c |
5 @@ -297,6 +297,11 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile) | 5 @@ -297,6 +297,11 @@ qcms_bool qcms_profile_is_bogus(qcms_profile *profile) |
6 sum[1] = rY + gY + bY; | 6 sum[1] = rY + gY + bY; |
7 sum[2] = rZ + gZ + bZ; | 7 sum[2] = rZ + gZ + bZ; |
8 | 8 |
9 +#if defined (_MSC_VER) | 9 +#if defined (_MSC_VER) |
10 +#pragma warning(push) | 10 +#pragma warning(push) |
(...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
660 - *dest++ = clamp_u8(out_linear_r*255); | 660 - *dest++ = clamp_u8(out_linear_r*255); |
661 - *dest++ = clamp_u8(out_linear_g*255); | 661 - *dest++ = clamp_u8(out_linear_g*255); |
662 - *dest++ = clamp_u8(out_linear_b*255); | 662 - *dest++ = clamp_u8(out_linear_b*255); |
663 + dest[r_out] = clamp_u8(out_linear_r*255); | 663 + dest[r_out] = clamp_u8(out_linear_r*255); |
664 + dest[1] = clamp_u8(out_linear_g*255); | 664 + dest[1] = clamp_u8(out_linear_g*255); |
665 + dest[b_out] = clamp_u8(out_linear_b*255); | 665 + dest[b_out] = clamp_u8(out_linear_b*255); |
666 + dest += 3; | 666 + dest += 3; |
667 } | 667 } |
668 } | 668 } |
669 #endif | 669 #endif |
| 670 @@ -815,7 +880,7 @@ void precache_release(struct precache_output *p) |
| 671 } |
| 672 } |
| 673 |
| 674 -#ifdef HAS_POSIX_MEMALIGN |
| 675 +#ifdef HAVE_POSIX_MEMALIGN |
| 676 static qcms_transform *transform_alloc(void) |
| 677 { |
| 678 qcms_transform *t; |
| 679 |
670 @@ -1262,7 +1327,17 @@ __attribute__((__force_align_arg_pointer__)) | 680 @@ -1262,7 +1327,17 @@ __attribute__((__force_align_arg_pointer__)) |
671 #endif | 681 #endif |
672 void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size
_t length) | 682 void qcms_transform_data(qcms_transform *transform, void *src, void *dest, size
_t length) |
673 { | 683 { |
674 - transform->transform_fn(transform, src, dest, length); | 684 - transform->transform_fn(transform, src, dest, length); |
675 + static const struct _qcms_format_type output_rgbx = { 0, 2 }; | 685 + static const struct _qcms_format_type output_rgbx = { 0, 2 }; |
676 + | 686 + |
677 + transform->transform_fn(transform, src, dest, length, output_rgbx); | 687 + transform->transform_fn(transform, src, dest, length, output_rgbx); |
678 +} | 688 +} |
679 + | 689 + |
680 +void qcms_transform_data_type(qcms_transform *transform, void *src, void *dest,
size_t length, qcms_output_type type) | 690 +void qcms_transform_data_type(qcms_transform *transform, void *src, void *dest,
size_t length, qcms_output_type type) |
681 +{ | 691 +{ |
682 + static const struct _qcms_format_type output_rgbx = { 0, 2 }; | 692 + static const struct _qcms_format_type output_rgbx = { 0, 2 }; |
683 + static const struct _qcms_format_type output_bgrx = { 2, 0 }; | 693 + static const struct _qcms_format_type output_bgrx = { 2, 0 }; |
684 + | 694 + |
685 + transform->transform_fn(transform, src, dest, length, type == QCMS_OUTPU
T_BGRX ? output_bgrx : output_rgbx); | 695 + transform->transform_fn(transform, src, dest, length, type == QCMS_OUTPU
T_BGRX ? output_bgrx : output_rgbx); |
686 } | 696 } |
687 | 697 |
688 qcms_bool qcms_supports_iccv4; | 698 qcms_bool qcms_supports_iccv4; |
OLD | NEW |