Description: Fix for libpng 1.6
Author: Programmer Nerd <theprogrammernerd@gmail.com>
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743388#20
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743388
Reviewed-by: Tobias Frost <tobi@debian.org>>
Last-Update: 2016-04-07
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/t4k_loaders.c
+++ b/src/t4k_loaders.c
@@ -1028,12 +1028,9 @@
       {
         png_init_io(png_ptr, fi);
 
-        info_ptr->width = surf->w;
-        info_ptr->height = surf->h;
-        info_ptr->bit_depth = 8;
-        info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-        info_ptr->interlace_type = 1;
-        info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
+	png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8,
+		PNG_COLOR_TYPE_RGB_ALPHA,  PNG_INTERLACE_NONE,
+                PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
         png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
                        PNG_sRGB_INTENT_PERCEPTUAL);
abs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906'>refs</a><a class='active' href='/guix/log/nix/nix-daemon?showmsg=1'>log</a><a href='/guix/tree/nix/nix-daemon?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906'>tree</a><a href='/guix/commit/nix/nix-daemon?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906'>commit</a><a href='/guix/diff/nix/nix-daemon?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/nix-daemon'>
<input type='hidden' name='id' value='d7f017d5ff5b045d8e4e18ccf4ede3a10da01906'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906&amp;showmsg=1'>root</a>/<a href='/guix/log/nix?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906&amp;showmsg=1'>nix</a>/<a href='/guix/log/nix/nix-daemon?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906&amp;showmsg=1'>nix-daemon</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/nix/nix-daemon?id=d7f017d5ff5b045d8e4e18ccf4ede3a10da01906'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2022-04-14 14:48:20 +0200'>2022-04-14</span></td><td class='logsubject'><a href='/guix/commit/nix/nix-daemon?id=5f74169e8e03e64a15499866c6a6de9f38d36f2d'>daemon: Support systemd-style socket activation.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* nix/nix-daemon/guix-daemon.cc (SD_LISTEN_FDS_START): New macro.
(systemd_activation_sockets): New function.
(main): Use it.  Remove obsolete 'printMsg' call.
* doc/guix.texi (Invoking guix-daemon): Document socket activation.


</td></tr>
<tr class='logheader'><td><span title='2021-04-03 22:08:33 +0200'>2021-04-03</span></td><td class='logsubject'><a href='/guix/commit/nix/nix-daemon?id=222fff253c6c6a3d1def16ed90723d7f2c4f9b89'>daemon: Remove dead code.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Reported by Noisytoot on #guix.

* nix/nix-daemon/shared.hh (showManPage): Remove.
* nix/nix-daemon/nix-daemon.cc (printHelp, programId): Remove.


</td></tr>
<tr class='logheader'><td><span title='2021-03-17 12:03:23 +0100'>2021-03-17</span></td><td class='logsubject'><a href='/guix/commit/nix/nix-daemon?id=bc3896db25c788c181c7bcd65754e7cd378e9d9f'>daemon: Correctly handle '--discover' with no value.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Previously, we'd get:

  $ guix-daemon --discover
  error: basic_string::_M_construct null not valid

* nix/nix-daemon/guix-daemon.cc (parse_opt): Change second argument to
'settings.set' to properly handle case where ARG is NULL.


</td></tr>
<tr class='logheader'><td><span title='2020-11-29 15:08:26 +0100'>2020-11-29</span></td><td class='logsubject'><a href='/guix/commit/nix/nix-daemon?id=79f9dee3c4c0e6d21066f142116a537207ae7ba4'>Use substitute servers on the local network.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/scripts/discover.scm: New file.
* Makefile.am (MODULES): Add it.
* nix/nix-daemon/guix-daemon.cc (options): Add "discover" option,
(parse-opt): parse it,
(main): start "guix discover" process when the option is set.
* guix/scripts/substitute.scm (%local-substitute-urls): New variable,
(substitute-urls): add it.
* gnu/services/base.scm (&lt;guix-configuration&gt;): Add "discover?"
field,
(guix-shepherd-service): honor it.
* doc/guix.texi (Invoking guix-daemon): Document "discover" option,
(Base Services): ditto.


</td></tr>
AS: Add fa and uk.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-02-04 18:29:00 +0100'>2022-02-04</span></td><td><a href='/guix/commit/po/packages/it.po?id=8391a99d089322a39cbacb1e6dc2979d8b2ef7c9'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.pt_BR.po: New file.
* po/doc/local.mk: Add it.
* doc/local.mk: Add pt_BR cookbook.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-01-09 11:35:59 +0100'>2022-01-09</span></td><td><a href='/guix/commit/po/packages/it.po?id=934b0cdfee2078bad42429427e12d6ee2ddb7fec'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.fi.po: New file.
* po/doc/guix-manual.fi.po: New file.
* po/doc/local.mk: Add them.
* doc/local.mk: Add them.
* po/guix/fi.po: New file.
* po/guix/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-12-04 19:40:52 +0100'>2021-12-04</span></td><td><a href='/guix/commit/po/packages/it.po?id=7fcb20a8fa242ab53b9bc97ef0b0367c6a399bd4'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-11-06 14:06:36 +0100'>2021-11-06</span></td><td><a href='/guix/commit/po/packages/it.po?id=85430a9ea6f32aaae3e34741e292a01a2de62ee0'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/doc/guix-cookbook.es.po: New file.
* po/doc/local.mk: Add 'es' cookbook.
* doc/local.mk: Add 'es' cookbook.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-10-17 22:10:25 +0200'>2021-10-17</span></td><td><a href='/guix/commit/po/packages/it.po?id=15c91189cb61c579f4289047c79530cefe75215f'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2021-09-02 04:06:52 +0200'>2021-09-02</span></td><td><a href='/guix/commit/po/packages/it.po?id=1ff2092a39dc5c7c7cd9b4a0ba4b59f92e738efc'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/packages/it.po: New file.
* po/packages/LINGUAS: Add `it'.
* po/*/*.po: Update translations.
</span></span></td><td>Julien Lepiller</td></tr>