[PATCH] mscms: make the correct value for bmformat.

[赵意]

Log: for driver "SHARP DX-2008UC", the wrong value for bmformat causes incorrect color picture data to be printed.

Signed-off-by: zhaoyi <[e-mail]&gt;
Change-Id: I9818dbd86f8a58777e185a76f027fd1c30b7f7ff
---
&nbsp;dlls/mscms/liblcms.c | 10 +++++-----
&nbsp;1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c
index 1f43c359c4..522e1dc3d0 100644
--- a/dlls/mscms/liblcms.c
+++ b/dlls/mscms/liblcms.c
@@ -49,12 +49,12 @@ static DWORD from_bmformat( BMFORMAT format )
&nbsp;
&nbsp; &nbsp; &nbsp;switch (format)
&nbsp; &nbsp; &nbsp;{
-&nbsp; &nbsp; case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break;
-&nbsp; &nbsp; case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break;
+&nbsp; &nbsp; case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break;
+&nbsp; &nbsp; case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break;
&nbsp; &nbsp; &nbsp;case BM_GRAY:&nbsp; &nbsp; &nbsp; &nbsp; ret = TYPE_GRAY_8; break;
-&nbsp; &nbsp; case BM_xRGBQUADS:&nbsp; &nbsp;ret = TYPE_ARGB_8; break;
-&nbsp; &nbsp; case BM_xBGRQUADS:&nbsp; &nbsp;ret = TYPE_ABGR_8; break;
-&nbsp; &nbsp; case BM_KYMCQUADS:&nbsp; &nbsp;ret = TYPE_KYMC_8; break;
+&nbsp; &nbsp; case BM_xRGBQUADS:&nbsp; &nbsp;ret = TYPE_ABGR_8; break;
+&nbsp; &nbsp; case BM_xBGRQUADS:&nbsp; &nbsp;ret = TYPE_ARGB_8; break;
+&nbsp; &nbsp; case BM_KYMCQUADS:&nbsp; &nbsp;ret = TYPE_CMYK_8; break;
&nbsp; &nbsp; &nbsp;default:
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;if (!quietfixme)
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;{
--&nbsp;
2.20.1

[Hans Leidekker]

On Wed, 2022-03-09 at 17:45 +0800, 赵意 wrote:
> Log: for driver "SHARP DX-2008UC", the wrong value for bmformat causes
> incorrect color picture data to be printed.
>
> Signed-off-by: zhaoyi 
> Change-Id: I9818dbd86f8a58777e185a76f027fd1c30b7f7ff
>
> dlls/mscms/liblcms.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/dlls/mscms/liblcms.c b/dlls/mscms/liblcms.c
> index 1f43c359c4..522e1dc3d0 100644
> --- a/dlls/mscms/liblcms.c
> +++ b/dlls/mscms/liblcms.c
> @@ -49,12 +49,12 @@ static DWORD from_bmformat( BMFORMAT format )
>  
>      switch (format)
>      {
> -    case BM_RGBTRIPLETS: ret = TYPE_RGB_8; break;
> -    case BM_BGRTRIPLETS: ret = TYPE_BGR_8; break;
> +    case BM_RGBTRIPLETS: ret = TYPE_BGR_8; break;
> +    case BM_BGRTRIPLETS: ret = TYPE_RGB_8; break;
>      case BM_GRAY:        ret = TYPE_GRAY_8; break;
> -    case BM_xRGBQUADS:   ret = TYPE_ARGB_8; break;
> -    case BM_xBGRQUADS:   ret = TYPE_ABGR_8; break;
> -    case BM_KYMCQUADS:   ret = TYPE_KYMC_8; break;
> +    case BM_xRGBQUADS:   ret = TYPE_ABGR_8; break;
> +    case BM_xBGRQUADS:   ret = TYPE_ARGB_8; break;
> +    case BM_KYMCQUADS:   ret = TYPE_CMYK_8; break;

Could you add a test case?

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=110143

Your paranoid android.

=== debian11 (build log) ===

error: corrupt patch at line 16
Task: Patch failed to apply

=== debian11 (build log) ===

error: corrupt patch at line 16
Task: Patch failed to apply