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);
ef='/guix/refs/?id=3528d888eed2e226826085f68b40171dee18c5cb'>refs</a><a class='active' href='/guix/log/nix'>log</a><a href='/guix/tree/nix?id=3528d888eed2e226826085f68b40171dee18c5cb'>tree</a><a href='/guix/commit/nix?id=3528d888eed2e226826085f68b40171dee18c5cb'>commit</a><a href='/guix/diff/nix?id=3528d888eed2e226826085f68b40171dee18c5cb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix'>
<input type='hidden' name='id' value='3528d888eed2e226826085f68b40171dee18c5cb'/><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=3528d888eed2e226826085f68b40171dee18c5cb'>root</a>/<a href='/guix/log/nix?id=3528d888eed2e226826085f68b40171dee18c5cb'>nix</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?id=3528d888eed2e226826085f68b40171dee18c5cb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-05-13 16:31:34 +0200'>2024-05-13</span></td><td><a href='/guix/commit/nix?id=7757fdd491862fa5c33f1f894503346b89898a01'>daemon: Loop over ‘copy_file_range’ upon short writes.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-03-12 14:07:28 +0100'>2024-03-12</span></td><td><a href='/guix/commit/nix?id=ff1251de0bc327ec478fc66a562430fbf35aef42'>daemon: Address shortcoming in previous security fix for CVE-2024-27297.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-03-11 22:12:34 +0100'>2024-03-11</span></td><td><a href='/guix/commit/nix?id=8f4ffb3fae133bb21d7991e97c2f19a7108b1143'>daemon: Protect against FD escape when building fixed-output derivations (CVE...</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-01-05 17:27:21 +0100'>2024-01-05</span></td><td><a href='/guix/commit/nix?id=d5724111ea2a8f5312b47fe9aae2bc74278c127e'>daemon: Change default ‘timeout’ and ‘max-silent-time’ values.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-12-17 01:00:00 +0100'>2023-12-17</span></td><td><a href='/guix/commit/nix?id=892ec53b7eedf998afa149b9cdd169f0cab8f41d'>daemon: Fix my own whitespace errors.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-12-10 01:00:00 +0100'>2023-12-10</span></td><td><a href='/guix/commit/nix?id=d993ed43b2bae8717437aa27d9d33fd223a6411f'>daemon: Sacrifice builders on OOM.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-12-11 23:18:53 +0100'>2023-12-11</span></td><td><a href='/guix/commit/nix?id=1e47148f46e31eb99ce8ec7bc12232cf50d0ebec'>daemon: Implement ‘substitute-urls’ RPC.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-12-04 22:26:36 +0100'>2023-12-04</span></td><td><a href='/guix/commit/nix?id=d83d4488da5c3bb65867bffa2b8587a7c7b056cc'>daemon: Simplify “empty status” substitute error message.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-09-24 02:00:00 +0200'>2023-09-24</span></td><td><a href='/guix/commit/nix?id=0500af5556307d0a4c14a23864e9e4bccd2643d7'>Revert "build: Add missing guix-gc.timer file to binary tarball."</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-09-26 17:36:58 +0200'>2023-09-26</span></td><td><a href='/guix/commit/nix?id=95f21231352b66f92c466cb30f2258291e854f2f'>daemon: Add “git-download” built-in builder.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-09-09 18:47:35 +0200'>2023-09-09</span></td><td><a href='/guix/commit/nix?id=cd469932758bf2bec1ff9c82aeb373e18730d0c4'>daemon: Fix build with GCC 13.</a><span class='msg-avail'>...</span></td><td>Sören Tempel</td></tr>
<tr><td><span title='2023-08-31 23:31:49 -0400'>2023-08-31</span></td><td><a href='/guix/commit/nix?id=69f6edc1a8596d2cb4c67e0435d35633af6f3cbc'>build: Add missing guix-gc.timer file to binary tarball.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-01-09 17:40:54 +0100'>2023-01-09</span></td><td><a href='/guix/commit/nix?id=407175a1d0e29f45639e7f28a531b3981cd20085'>daemon: Improve error message for wrong hash sizes.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-12-18 01:16:47 +0100'>2022-12-18</span></td><td><a href='/guix/commit/nix?id=2d4d26769d6a3be1b21302b0bb2bd099fd55ccf8'>daemon: Make "opening file" error messages distinguishable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-10-17 09:37:27 +0200'>2022-10-17</span></td><td><a href='/guix/commit/nix?id=eec920ba93ecb086366576e31b785962fbaf81c2'>Revert "nix: Guard against removing temporary roots of living processes."</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-10-07 16:54:20 -0400'>2022-10-07</span></td><td><a href='/guix/commit/nix?id=bb0beaecdee1a2315a1269b1746d238c8ab0e699'>nix: Guard against removing temporary roots of living processes.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-09-11 16:43:30 +0200'>2022-09-11</span></td><td><a href='/guix/commit/nix?id=4b32f87e9adf91d5d94287562d8844727d47a07b'>daemon: Remove unused function findOutput.</a><span class='msg-avail'>...</span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2022-09-11 16:43:30 +0200'>2022-09-11</span></td><td><a href='/guix/commit/nix?id=93032586df6b925e1ed9102dc3a77aa626aa60d3'>daemon: Remove unused function exportPaths.</a><span class='msg-avail'>...</span></td><td>Maxime Devos</td></tr>
<tr><td><span title='2022-09-11 16:43:30 +0200'>2022-09-11</span></td><td><a href='/guix/commit/nix?id=1c5f5d6d8cb3bd42ed436e31366a328598165734'>daemon: Remove unused function openStore.</a><span class='msg-avail'>...</span></td><td>Maxime Devos</td></tr>