wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 79ebd3f3bf9e5b6607363667d03def04e254f710.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-08-24 03:42:23 +02:00
parent e53b4e2702
commit 6b9d11ac58
3 changed files with 10 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/windowscodecs-Palette_Images/0005-windowscodecs-Add-support-for-palette-image-formats-.patch
View File

@@ -1,4 +1,4 @@
From 22e7223f23016a0c1cffeb58158c59ec82273e51 Mon Sep 17 00:00:00 2001
From ed7888a251aef87d82b931a02edc26c9899a236c Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Tue, 20 Sep 2016 14:28:49 +0800
Subject: windowscodecs: Add support for palette image formats to PNG encoder.
@@ -9,7 +9,7 @@ Subject: windowscodecs: Add support for palette image formats to PNG encoder.
2 files changed, 49 insertions(+)
diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c
index 4473b98..d8b4e2f 100644
index 10c96038630..3df2c426a46 100644
--- a/dlls/windowscodecs/pngformat.c
+++ b/dlls/windowscodecs/pngformat.c
@@ -1,5 +1,6 @@
@@ -19,7 +19,7 @@ index 4473b98..d8b4e2f 100644
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -326,8 +327,10 @@ MAKE_FUNCPTR(png_set_gray_to_rgb);
@@ -325,8 +326,10 @@ MAKE_FUNCPTR(png_set_gray_to_rgb);
MAKE_FUNCPTR(png_set_interlace_handling);
MAKE_FUNCPTR(png_set_IHDR);
MAKE_FUNCPTR(png_set_pHYs);
@@ -30,7 +30,7 @@ index 4473b98..d8b4e2f 100644
MAKE_FUNCPTR(png_set_tRNS_to_alpha);
MAKE_FUNCPTR(png_set_write_fn);
MAKE_FUNCPTR(png_read_end);
@@ -386,8 +389,10 @@ static void *load_libpng(void)
@@ -389,8 +392,10 @@ static void *load_libpng(void)
LOAD_FUNCPTR(png_set_interlace_handling);
LOAD_FUNCPTR(png_set_IHDR);
LOAD_FUNCPTR(png_set_pHYs);
@@ -41,8 +41,8 @@ index 4473b98..d8b4e2f 100644
LOAD_FUNCPTR(png_set_tRNS_to_alpha);
LOAD_FUNCPTR(png_set_write_fn);
LOAD_FUNCPTR(png_read_end);
@@ -1313,6 +1318,10 @@ static const struct png_pixelformat formats[] = {
{&GUID_WICPixelFormat32bppBGRA, 32, 8, PNG_COLOR_TYPE_RGB_ALPHA, 0, 1},
@@ -1315,6 +1320,10 @@ static const struct png_pixelformat formats[] = {
{&GUID_WICPixelFormat32bppBGR, 32, 8, PNG_COLOR_TYPE_RGB, 1, 1},
{&GUID_WICPixelFormat48bppRGB, 48, 16, PNG_COLOR_TYPE_RGB, 0, 0},
{&GUID_WICPixelFormat64bppRGBA, 64, 16, PNG_COLOR_TYPE_RGB_ALPHA, 0, 0},
+ {&GUID_WICPixelFormat1bppIndexed, 1, 1, PNG_COLOR_TYPE_PALETTE, 0, 0},
@@ -52,7 +52,7 @@ index 4473b98..d8b4e2f 100644
{NULL},
};
@@ -1600,6 +1609,42 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface,
@@ -1617,6 +1626,42 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface,
(This->yres+0.0127) / 0.0254, PNG_RESOLUTION_METER);
}
@@ -96,7 +96,7 @@ index 4473b98..d8b4e2f 100644
if (This->format->remove_filler)
diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c
index 10a6c03..b011d71 100644
index 10a6c03d9b6..b011d716451 100644
--- a/dlls/windowscodecs/regsvr.c
+++ b/dlls/windowscodecs/regsvr.c
@@ -1359,6 +1359,10 @@ static GUID const * const png_encode_formats[] = {
@@ -111,5 +111,5 @@ index 10a6c03..b011d71 100644
};
--
2.9.0
2.14.1