summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libpng/libpng/transform.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/libpng/libpng/transform.patch')
-rw-r--r--meta/recipes-multimedia/libpng/libpng/transform.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/meta/recipes-multimedia/libpng/libpng/transform.patch b/meta/recipes-multimedia/libpng/libpng/transform.patch
deleted file mode 100644
index 369a2c0b7f..0000000000
--- a/meta/recipes-multimedia/libpng/libpng/transform.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1Corrected the test on user transform changes on read. It was in the png_set of
2the transform function, but that doesn't matter unless the transform function
3changes the rowbuf size, and that is only valid if transform_info is called.
4
5Upstream-Status: Backport (will be in 1.6.2)
6 - b44cd59ad9747069b90c6ff0f76558157a61e26a
7 - a8715cabd11354da9650dff7c0770686a217b550
8Signed-off-by: Ross Burton <ross.burton@intel.com>
9
10
11diff --git a/pngrtran.c b/pngrtran.c
12index 626f3b0..4485e40 100644
13--- a/pngrtran.c
14+++ b/pngrtran.c
15@@ -1056,9 +1056,6 @@ png_set_read_user_transform_fn(png_structrp png_ptr, png_user_transform_ptr
16 {
17 png_debug(1, "in png_set_read_user_transform_fn");
18
19- if (!png_rtran_ok(png_ptr, 0))
20- return;
21-
22 #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
23 png_ptr->transformations |= PNG_USER_TRANSFORM;
24 png_ptr->read_user_transform_fn = read_user_transform_fn;
25diff --git a/pngtrans.c b/pngtrans.c
26index b532172..f822324 100644
27--- a/pngtrans.c
28+++ b/pngtrans.c
29@@ -782,6 +782,17 @@ png_set_user_transform_info(png_structrp png_ptr, png_voidp
30
31 if (png_ptr == NULL)
32 return;
33+
34+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
35+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
36+ (png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
37+ {
38+ png_app_error(png_ptr,
39+ "info change after png_start_read_image or png_read_update_info");
40+ return;
41+ }
42+#endif
43+
44 png_ptr->user_transform_ptr = user_transform_ptr;
45 png_ptr->user_transform_depth = (png_byte)user_transform_depth;
46 png_ptr->user_transform_channels = (png_byte)user_transform_channels;