[arch-commits] Commit in libpng/trunk (4 files)
Date: Saturday, July 20, 2013 @ 04:05:33
Author: foutrelis
Revision: 191205
upgpkg: libpng 1.6.3-1
New upstream release.
Modified:
libpng/trunk/PKGBUILD
Deleted:
libpng/trunk/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
libpng/trunk/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
libpng/trunk/adjust-apng-patch-for-libpng16-git-changes.patch
-+
0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch | 106 ---
0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch | 133
--
PKGBUILD| 23 -
adjust-apng-patch-for-libpng16-git-changes.patch| 19 -
4 files changed, 6 insertions(+), 275 deletions(-)
Deleted: 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
===
--- 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
2013-07-20 01:49:05 UTC (rev 191204)
+++ 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
2013-07-20 02:05:33 UTC (rev 191205)
@@ -1,106 +0,0 @@
-From 56d6bc2e8855d25e03816509a0137c3a70410ae6 Mon Sep 17 00:00:00 2001
-From: Glenn Randers-Pehrson glennrp at users.sourceforge.net
-Date: Mon, 29 Apr 2013 08:57:14 -0500
-Subject: [PATCH 06/10] [libpng16] Avoid dereferencing NULL pointer possibly
- returned from
-
-png_create_write_struct() (Andrew Church).
- ANNOUNCE | 6 --
- CHANGES| 4 +++-
- pngwrite.c | 65 +++---
- 3 files changed, 39 insertions(+), 36 deletions(-)
-
- (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.)
-
-diff --git a/pngwrite.c b/pngwrite.c
-index 33924aa..b71a3d3 100644
a/pngwrite.c
-+++ b/pngwrite.c
-@@ -494,51 +494,50 @@ png_create_write_struct_2,(png_const_charp user_png_ver,
png_voidp error_ptr,
-png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
- error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
- #endif /* PNG_USER_MEM_SUPPORTED */
-+ if (png_ptr != NULL)
-+ {
-+ /* Set the zlib control values to defaults; they can be overridden by
the
-+ * application after the struct has been created.
-+ */
-+ png_ptr-zbuffer_size = PNG_ZBUF_SIZE;
-
-- /* Set the zlib control values to defaults; they can be overridden by the
--* application after the struct has been created.
--*/
-- png_ptr-zbuffer_size = PNG_ZBUF_SIZE;
--
-- /* The 'zlib_strategy' setting is irrelevant because png_default_claim in
--* pngwutil.c defaults it according to whether or not filters will be used,
--* and ignores this setting.
--*/
-- png_ptr-zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
-- png_ptr-zlib_level = PNG_Z_DEFAULT_COMPRESSION;
-- png_ptr-zlib_mem_level = 8;
-- png_ptr-zlib_window_bits = 15;
-- png_ptr-zlib_method = 8;
-+ /* The 'zlib_strategy' setting is irrelevant because png_default_claim
in
-+ * pngwutil.c defaults it according to whether or not filters will be
-+ * used, and ignores this setting.
-+ */
-+ png_ptr-zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
-+ png_ptr-zlib_level = PNG_Z_DEFAULT_COMPRESSION;
-+ png_ptr-zlib_mem_level = 8;
-+ png_ptr-zlib_window_bits = 15;
-+ png_ptr-zlib_method = 8;
-
- #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-- png_ptr-zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
-- png_ptr-zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
-- png_ptr-zlib_text_mem_level = 8;
-- png_ptr-zlib_text_window_bits = 15;
-- png_ptr-zlib_text_method = 8;
-+ png_ptr-zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
-+ png_ptr-zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
-+ png_ptr-zlib_text_mem_level = 8;
-+ png_ptr-zlib_text_window_bits = 15;
-+ png_ptr-zlib_text_method = 8;
- #endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
-
-- /* This is a highly dubious configuration option; by default it is off, but
--* it may be appropriate for private builds that are testing extensions not
--* conformant to the current specification, or of applications that must
not
--* fail to write at all costs!
--*/
--# ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
-+ /* This is a highly dubious configuration option; by default it is off,
-+ * but it may be appropriate for private builds that are testing
-+ * extensions not conformant to the current specification, or of
-+ * applications that must not fail to write at all costs!
-+ */
-+#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
- png_ptr-flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
- /* In stable builds only warn if an application error can be completely
-* handled.
-*/
--# endif
-+#endif
-
-- /* App warnings are warnings in release (or release candidate) builds but
--* are errors
[arch-commits] Commit in libpng/trunk (4 files)
Date: Monday, May 6, 2013 @ 11:40:01
Author: foutrelis
Revision: 184329
upgpkg: libpng 1.6.2-3
Add upstream workaround for PNG images with bad CMF bytes.
Added:
libpng/trunk/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
libpng/trunk/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch
libpng/trunk/adjust-apng-patch-for-libpng16-git-changes.patch
Modified:
libpng/trunk/PKGBUILD
-+
0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch | 106 +++
0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch | 133
++
PKGBUILD| 25 +
adjust-apng-patch-for-libpng16-git-changes.patch| 19 +
4 files changed, 278 insertions(+), 5 deletions(-)
Added: 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
===
--- 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
(rev 0)
+++ 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch
2013-05-06 09:40:01 UTC (rev 184329)
@@ -0,0 +1,106 @@
+From 56d6bc2e8855d25e03816509a0137c3a70410ae6 Mon Sep 17 00:00:00 2001
+From: Glenn Randers-Pehrson glennrp at users.sourceforge.net
+Date: Mon, 29 Apr 2013 08:57:14 -0500
+Subject: [PATCH 06/10] [libpng16] Avoid dereferencing NULL pointer possibly
+ returned from
+
+png_create_write_struct() (Andrew Church).
+---
+ ANNOUNCE | 6 --
+ CHANGES| 4 +++-
+ pngwrite.c | 65 +++---
+ 3 files changed, 39 insertions(+), 36 deletions(-)
+
+ (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.)
+
+diff --git a/pngwrite.c b/pngwrite.c
+index 33924aa..b71a3d3 100644
+--- a/pngwrite.c
b/pngwrite.c
+@@ -494,51 +494,50 @@ png_create_write_struct_2,(png_const_charp user_png_ver,
png_voidp error_ptr,
+png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
+ error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
+ #endif /* PNG_USER_MEM_SUPPORTED */
++ if (png_ptr != NULL)
++ {
++ /* Set the zlib control values to defaults; they can be overridden by
the
++ * application after the struct has been created.
++ */
++ png_ptr-zbuffer_size = PNG_ZBUF_SIZE;
+
+- /* Set the zlib control values to defaults; they can be overridden by the
+-* application after the struct has been created.
+-*/
+- png_ptr-zbuffer_size = PNG_ZBUF_SIZE;
+-
+- /* The 'zlib_strategy' setting is irrelevant because png_default_claim in
+-* pngwutil.c defaults it according to whether or not filters will be used,
+-* and ignores this setting.
+-*/
+- png_ptr-zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
+- png_ptr-zlib_level = PNG_Z_DEFAULT_COMPRESSION;
+- png_ptr-zlib_mem_level = 8;
+- png_ptr-zlib_window_bits = 15;
+- png_ptr-zlib_method = 8;
++ /* The 'zlib_strategy' setting is irrelevant because png_default_claim
in
++ * pngwutil.c defaults it according to whether or not filters will be
++ * used, and ignores this setting.
++ */
++ png_ptr-zlib_strategy = PNG_Z_DEFAULT_STRATEGY;
++ png_ptr-zlib_level = PNG_Z_DEFAULT_COMPRESSION;
++ png_ptr-zlib_mem_level = 8;
++ png_ptr-zlib_window_bits = 15;
++ png_ptr-zlib_method = 8;
+
+ #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
+- png_ptr-zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
+- png_ptr-zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
+- png_ptr-zlib_text_mem_level = 8;
+- png_ptr-zlib_text_window_bits = 15;
+- png_ptr-zlib_text_method = 8;
++ png_ptr-zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY;
++ png_ptr-zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION;
++ png_ptr-zlib_text_mem_level = 8;
++ png_ptr-zlib_text_window_bits = 15;
++ png_ptr-zlib_text_method = 8;
+ #endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
+
+- /* This is a highly dubious configuration option; by default it is off, but
+-* it may be appropriate for private builds that are testing extensions not
+-* conformant to the current specification, or of applications that must
not
+-* fail to write at all costs!
+-*/
+-# ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
++ /* This is a highly dubious configuration option; by default it is off,
++ * but it may be appropriate for private builds that are testing
++ * extensions not conformant to the current specification, or of
++ * applications that must not fail to write at all costs!
++ */
++#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED
+ png_ptr-flags |= PNG_FLAG_BENIGN_ERRORS_WARN;
+ /* In stable builds only warn if an application error can be completely
+* handled.
+*/
+-# endif
++#endif
+
+- /* App warnings are warnings in release (or release candidate) builds but
